-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[DebugInfo] Emit debug info for witness tables #81661
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: release/6.2
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1163,8 +1163,42 @@ class IRGenSILFunction : | |
emitPackCountDebugVariable(Shape); | ||
} | ||
}); | ||
|
||
if (auto *BGT = llvm::dyn_cast<BoundGenericType>(Ty)) { | ||
auto Decl = BGT->getDecl(); | ||
auto GE = Decl->getGenericEnvironment(); | ||
auto Requirements = BGT->getDecl() | ||
->getGenericEnvironment() | ||
->getGenericSignature() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can replace |
||
.getRequirements(); | ||
for (auto Requirement : Requirements) { | ||
if (Requirement.getKind() == RequirementKind::Conformance) { | ||
auto ProtocolDecl = Requirement.getProtocolDecl(); | ||
auto ConformingType = Requirement.getFirstType(); | ||
Type Archetype; | ||
if (auto GTPT = llvm::dyn_cast<GenericTypeParamType>( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These conditionals are unnecessary. mapTypeIntoContext() takes a Type. Also, we use |
||
ConformingType.getPointer())) | ||
Archetype = GE->mapTypeIntoContext(GTPT); | ||
else if (auto DMT = llvm::dyn_cast<DependentMemberType>( | ||
ConformingType.getPointer())) | ||
Archetype = GE->mapTypeIntoContext(DMT); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure what this code is trying to do, but it's not correct. The types Also, you're not looking at the generic arguments of the BGT here. Presumably it should do that? |
||
|
||
if (Lowering::TypeConverter::protocolRequiresWitnessTable( | ||
ProtocolDecl) && | ||
tryGetLocalTypeData( | ||
Archetype->getCanonicalType(), | ||
LocalTypeDataKind::forAbstractProtocolWitnessTable( | ||
ProtocolDecl))) { | ||
auto Conformance = | ||
ProtocolConformanceRef::forAbstract(Archetype, ProtocolDecl); | ||
|
||
emitWitnessTableRef(*this, Archetype->getCanonicalType(), | ||
Conformance); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
/// Emit debug info for a function argument or a local variable. | ||
template <typename StorageType> | ||
void emitDebugVariableDeclaration( | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -408,26 +408,59 @@ static void maybeEmitDebugInfoForLocalTypeData(IRGenFunction &IGF, | |
// functions that were inlined into transparent functions. Correct would be to | ||
// check which instruction requests the type metadata and see whether its | ||
// inlined function is transparent. | ||
auto * DS = IGF.getDebugScope(); | ||
auto *DS = IGF.getDebugScope(); | ||
if (DS && DS->getInlinedFunction() && | ||
DS->getInlinedFunction()->isTransparent()) | ||
return; | ||
|
||
// Only for formal type metadata. | ||
if (key.Kind != LocalTypeDataKind::forFormalTypeMetadata()) | ||
// For formal type metadata and witness tables. | ||
ProtocolDecl *proto = nullptr; | ||
|
||
if (key.Kind.isAbstractProtocolConformance()) | ||
proto = key.Kind.getAbstractProtocolConformance(); | ||
else if (key.Kind.isConcreteProtocolConformance()) | ||
proto = key.Kind.getConcreteProtocolConformance()->getProtocol(); | ||
else if (key.Kind != LocalTypeDataKind::forFormalTypeMetadata()) | ||
return; | ||
|
||
// Only for archetypes, and not for opened/opaque archetypes. | ||
auto type = dyn_cast<ArchetypeType>(key.Type); | ||
if (!type) | ||
return; | ||
if (!type->isRoot()) | ||
if (!type->isRoot() && !proto) | ||
return; | ||
if (!isa<PrimaryArchetypeType>(type) && !isa<PackArchetypeType>(type)) | ||
return; | ||
|
||
auto *typeParam = type->getInterfaceType()->castTo<GenericTypeParamType>(); | ||
auto name = typeParam->getName().str(); | ||
auto interfaceType = type->getInterfaceType(); | ||
llvm::SmallString<16> name; | ||
llvm::SmallString<16> displayName; | ||
if (auto DMT = | ||
llvm::dyn_cast<DependentMemberType>(interfaceType.getPointer())) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment about |
||
std::function<void(DependentMemberType *)> visitDependentMembers = | ||
[&](DependentMemberType *member) { | ||
if (member == nullptr) | ||
return; | ||
if (auto *parent = | ||
llvm::dyn_cast<DependentMemberType>(member->getBase())) { | ||
visitDependentMembers(parent); | ||
name.append("$"); | ||
displayName.append("."); | ||
} | ||
name.append(member->getName().str()); | ||
displayName.append(member->getName().str()); | ||
}; | ||
name.append(DMT->getRootGenericParam()->getCanonicalName().str()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not just print the generic param as the base case of the recursion? (where member->getBase() is not another DMT) |
||
name.append("$"); | ||
displayName.append(DMT->getRootGenericParam()->getName().str()); | ||
displayName.append("."); | ||
visitDependentMembers(DMT); | ||
} else if (auto GTPT = llvm::dyn_cast<GenericTypeParamType>( | ||
interfaceType.getPointer())) { | ||
name = GTPT->getCanonicalName().str(); | ||
displayName = GTPT->getName().str(); | ||
} else { | ||
return; | ||
} | ||
|
||
llvm::Value *data = value.getMetadata(); | ||
|
||
|
@@ -438,7 +471,7 @@ static void maybeEmitDebugInfoForLocalTypeData(IRGenFunction &IGF, | |
// though; see the comment in IRGenFunctionSIL::emitShadowCopyIfNeeded(). | ||
if (!IGF.IGM.IRGen.Opts.shouldOptimize() && !IGF.isAsync()) { | ||
auto alloca = | ||
IGF.createAlloca(data->getType(), IGF.IGM.getPointerAlignment(), name); | ||
IGF.createAlloca(data->getType(), IGF.IGM.getPointerAlignment(), displayName); | ||
IGF.Builder.CreateStore(data, alloca); | ||
data = alloca.getAddress(); | ||
} | ||
|
@@ -447,10 +480,12 @@ static void maybeEmitDebugInfoForLocalTypeData(IRGenFunction &IGF, | |
if (!IGF.IGM.DebugInfo) | ||
return; | ||
|
||
IGF.IGM.DebugInfo->emitTypeMetadata(IGF, data, | ||
typeParam->getDepth(), | ||
typeParam->getIndex(), | ||
name); | ||
if (proto) { | ||
IGF.IGM.DebugInfo->emitWitnessTable(IGF, data, name, proto); | ||
} else { | ||
auto *typeParam = type->getInterfaceType()->castTo<GenericTypeParamType>(); | ||
IGF.IGM.DebugInfo->emitTypeMetadata(IGF, data, typeParam); | ||
} | ||
} | ||
|
||
void | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
// RUN: %target-swift-frontend %s -emit-ir -g -o - | ||
import StdlibUnittest | ||
protocol P1 {} | ||
protocol P2 {} | ||
protocol P3 {} | ||
protocol P4 {} | ||
protocol P5 {} | ||
|
||
struct I: P1, P2, P4 {} | ||
struct I2: P3 {} | ||
struct I3: P5 {} | ||
|
||
struct S<T, U: P3> where T: P1, T: P2 { | ||
let t: T | ||
let u: U | ||
|
||
func foo() { | ||
} | ||
//CHECK: ![[foo:[0-9]+]] = distinct !DISubprogram(name: "foo", linkageName: "$s13witness_table1SV3fooyyF", | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P1_pmD", scope: ![[foo]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P2_pmD", scope: ![[foo]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_0", scope: ![[foo]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_U_$s13witness_table2P3_pmD", scope: ![[foo]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_1", scope: ![[foo]], {{.*}}, flags: DIFlagArtificial) | ||
|
||
func bar<V: P4>(v: V) { | ||
} | ||
//CHECK: ![[bar:[0-9]+]] = distinct !DISubprogram(name: "bar", linkageName: "$s13witness_table1SV3bar1vyqd___tAA2P4Rd__lF", | ||
//CHECK: !DILocalVariable(name: "$\CF\84_1_0", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_V_$s13witness_table2P4_pmD", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P1_pmD", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P2_pmD", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_0", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_U_$s13witness_table2P3_pmD", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_1", scope: ![[bar]], {{.*}}, flags: DIFlagArtificial) | ||
} | ||
|
||
extension S where T: P5 { | ||
func baz() { | ||
} | ||
|
||
//CHECK: ![[baz:[0-9]+]] = distinct !DISubprogram(name: "baz", linkageName: "$s13witness_table1SVA2A2P5RzrlE3bazyyF", | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P5_pmD", scope: ![[baz]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P1_pmD", scope: ![[baz]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table2P2_pmD", scope: ![[baz]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_0", scope: ![[baz]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_U_$s13witness_table2P3_pmD", scope: ![[baz]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_1", scope: ![[baz]], {{.*}}, flags: DIFlagArtificial) | ||
} | ||
|
||
S(t: I(), u: I2()) | ||
|
||
func freeFunc<T1: P1, T2>(t1: T1, t2: T2) where T2: P3, T2: P4 { | ||
} | ||
//CHECK: ![[freeFunc:[0-9]+]] = distinct !DISubprogram(name: "freeFunc", linkageName: "$s13witness_table8freeFunc2t12t2yx_q_tAA2P1RzAA2P3R_AA2P4R_r0_lF", | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_0", scope: ![[freeFunc]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_1", scope: ![[freeFunc]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T1_$s13witness_table2P1_pmD", scope: ![[freeFunc]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T2_$s13witness_table2P3_pmD", scope: ![[freeFunc]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T2_$s13witness_table2P4_pmD", scope: ![[freeFunc]], {{.*}}, flags: DIFlagArtificial) | ||
|
||
protocol A { | ||
associatedtype Element | ||
} | ||
|
||
func withAssociatedType<T: A>(_: T) where T.Element: A { | ||
} | ||
|
||
//CHECK: ![[withAssociatedType:[0-9]+]] = distinct !DISubprogram(name: "withAssociatedType", linkageName: "$s13witness_table18withAssociatedTypeyyxAA1ARzAaC7ElementRpzlF" | ||
//CHECK: !DILocalVariable(name: "$\CF\84_0_0", scope: ![[withAssociatedType]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T_$s13witness_table1A_pmD", scope: ![[withAssociatedType]], {{.*}}, flags: DIFlagArtificial) | ||
//CHECK: !DILocalVariable(name: "$WT_T.Element_$s13witness_table1A_pmD", scope: ![[withAssociatedType]], {{.*}}, flags: DIFlagArtificial) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can also nest non-generic nominals inside other generic nominals, eg
Eg,
G<Int>.Inner
is not a BoundGenericType.Just use getAnyNominal() instead