averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[cxx-interop] Re-enable debug mangling.

Browse Source
This commit is contained in:
zoecarver
2022-08-12 15:55:20 -07:00
parent 590caf9cbb
commit 39af79f491
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/IRGen/IRGenDebugInfo.cpp
View File

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

5
lib/IRGen/IRGenSIL.cpp
View File

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

1
test/Interop/Cxx/class/debug-info-irgen.swift
View File

@@ -1,7 +1,6 @@
// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir -g | %FileCheck %s // 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. // 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 import DebugInfo