Merge pull request #60539 from zoecarver/two-misc-fixes

[cxx-interop] Re-enable debug mangling for C++ value types.

Author: zoecarver

lib/IRGen/IRGenDebugInfo.cpp

@@ -1735,12 +1735,6 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
 
   /// Determine if there exists a name mangling for the given type.
   static bool canMangle(TypeBase *Ty) {
-    // TODO: C++ types are not yet supported (SR-13223).
-    if (Ty->getStructOrBoundGenericStruct() &&
-        isa_and_nonnull<clang::CXXRecordDecl>(
-            Ty->getStructOrBoundGenericStruct()->getClangDecl()))
-      return false;
-
     switch (Ty->getKind()) {
     case TypeKind::GenericFunction: // Not yet supported.
     case TypeKind::SILBlockStorage: // Not supported at all.
@@ -2866,14 +2860,9 @@ void IRGenDebugInfoImpl::emitGlobalVariableDeclaration(
   if (Opts.DebugInfoLevel <= IRGenDebugInfoLevel::LineTables)
     return;
 
-  // TODO: fix demangling for C++ types (SR-13223).
   if (swift::TypeBase *ty = DbgTy.getType()) {
     if (MetatypeType *metaTy = dyn_cast<MetatypeType>(ty))
       ty = metaTy->getInstanceType().getPointer();
-    if (ty->getStructOrBoundGenericStruct() &&
-        isa_and_nonnull<clang::CXXRecordDecl>(
-            ty->getStructOrBoundGenericStruct()->getClangDecl()))
-      return;
   }
 
   llvm::DIType *DITy = getOrCreateType(DbgTy);

lib/IRGen/IRGenSIL.cpp

@@ -1087,14 +1087,9 @@ class IRGenSILFunction :
       const SILDebugScope *DS, SILLocation VarLoc, SILDebugVariable VarInfo,
       IndirectionKind Indirection,
       AddrDbgInstrKind DbgInstrKind = AddrDbgInstrKind::DbgDeclare) {
-    // TODO: fix demangling for C++ types (SR-13223).
     if (swift::TypeBase *ty = SILTy.getASTType().getPointer()) {
       if (MetatypeType *metaTy = dyn_cast<MetatypeType>(ty))
         ty = metaTy->getRootClass().getPointer();
-      if (ty->getStructOrBoundGenericStruct() &&
-          isa_and_nonnull<clang::CXXRecordDecl>(
-              ty->getStructOrBoundGenericStruct()->getClangDecl()))
-        return;
     }
 
     assert(IGM.DebugInfo && "debug info not enabled");

test/Interop/Cxx/class/debug-info-irgen.swift

@@ -1,7 +1,6 @@
 // RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir -g | %FileCheck %s
 
 // Validate that we don't crash when trying to deserialize C++ type debug info.
-// Note, however, that the actual debug info is not generated, see SR-13223.
 
 import DebugInfo