Revert "[cxx-interop] Use clang::CanQualType in ClangTypeExplicitSafetyDescriptor"

This reverts commit 5328572.

Author: j-hui

include/swift/ClangImporter/ClangImporterRequests.h

@@ -625,11 +625,9 @@ void simple_display(llvm::raw_ostream &out, CxxValueSemanticsDescriptor desc);
 SourceLoc extractNearestSourceLoc(CxxValueSemanticsDescriptor desc);
 
 struct ClangTypeExplicitSafetyDescriptor final {
-  clang::CanQualType type;
+  clang::QualType type;
 
-  ClangTypeExplicitSafetyDescriptor(clang::CanQualType type) : type(type) {}
-  ClangTypeExplicitSafetyDescriptor(clang::QualType type)
-      : type(type->getCanonicalTypeUnqualified()) {}
+  ClangTypeExplicitSafetyDescriptor(clang::QualType type) : type(type) {}
 
   friend llvm::hash_code
   hash_value(const ClangTypeExplicitSafetyDescriptor &desc) {

lib/ClangImporter/ClangImporter.cpp

@@ -8725,8 +8725,8 @@ SourceLoc swift::extractNearestSourceLoc(SafeUseOfCxxDeclDescriptor desc) {
 
 void swift::simple_display(llvm::raw_ostream &out,
                            ClangTypeExplicitSafetyDescriptor desc) {
-  auto qt = static_cast<clang::QualType>(desc.type);
-  out << "Checking if type '" << qt.getAsString() << "' is explicitly safe.\n";
+  out << "Checking if type '" << desc.type.getAsString()
+      << "' is explicitly safe.\n";
 }
 
 SourceLoc swift::extractNearestSourceLoc(ClangTypeExplicitSafetyDescriptor desc) {
@@ -8735,7 +8735,7 @@ SourceLoc swift::extractNearestSourceLoc(ClangTypeExplicitSafetyDescriptor desc)
 
 ExplicitSafety ClangTypeExplicitSafety::evaluate(
     Evaluator &evaluator, ClangTypeExplicitSafetyDescriptor desc) const {
-  auto clangType = static_cast<clang::QualType>(desc.type);
+  auto clangType = desc.type;
 
   // Handle pointers.
   auto pointeeType = clangType->getPointeeType();