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

Revert "Add debug info support for inlined and specialized generic variables."

Browse Source 
There is an assertion failure building the source compatibility suite that
needs to be investigated.

This reverts commit 91f6f34119.
This commit is contained in:
Adrian Prantl
2018-07-07 13:01:01 -07:00
parent a6952decab
commit fdad9076f2
18 changed files with 69 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SILOptimizer/Utils/SILInliner.cpp
View File

@@ -248,6 +248,10 @@ void SILInliner::inlineFunction(FullApplySite AI, ArrayRef<SILValue> Args) {
assert(CallSiteScope && "call site has no scope");
assert(CallSiteScope->getParentFunction() == &F);
// Increment the ref count for the inlined function, so it doesn't
// get deleted before we can emit abstract debug info for it.
CalleeFunction->setInlined();
// If the caller's BB is not the last BB in the calling function, then keep
// track of the next BB so we always insert new BBs before it; otherwise,
// we just leave the new BBs at the end as they are by default.
@@ -428,20 +432,12 @@ SILInliner::getOrCreateInlineScope(const SILDebugScope *CalleeScope) {
if (it != InlinedScopeCache.end())
return it->second;
auto &M = getBuilder().getModule();
auto &M = getBuilder().getFunction().getModule();
auto InlinedAt =
getOrCreateInlineScope(CalleeScope->InlinedCallSite);
auto *ParentFunction = CalleeScope->Parent.dyn_cast<SILFunction *>();
if (ParentFunction)
ParentFunction = remapParentFunction(
M, ParentFunction, SubsMap,
CalleeFunction->getLoweredFunctionType()->getGenericSignature(),
ForInlining);
auto *ParentScope = CalleeScope->Parent.dyn_cast<const SILDebugScope *>();
auto ParentScope = CalleeScope->Parent.dyn_cast<const SILDebugScope *>();
auto *InlinedScope = new (M) SILDebugScope(
CalleeScope->Loc, ParentFunction,
CalleeScope->Loc, CalleeScope->Parent.dyn_cast<SILFunction *>(),
ParentScope ? getOrCreateInlineScope(ParentScope) : nullptr, InlinedAt);
InlinedScopeCache.insert({CalleeScope, InlinedScope});
return InlinedScope;