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

[Coverage] Make ~ProfilerRAII restore the correct context

Browse Source 
Swift permits function decls within function decls. ~ProfilerRAII would
destroy the current profiling context upon entering a nested function
decl instead of preserving it for later use. Fix the issue by recording
the correct context in ProfilerRAII.
This commit is contained in:
Vedant Kumar
2016-02-12 21:12:33 -08:00
parent 7b34ea9296
commit c5873f3683
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SILGen/SILGenProfiling.cpp
View File

@@ -30,13 +30,14 @@ using namespace swift;
using namespace Lowering;
static bool isUnmappedDecl(Decl *D) {
return (D->isImplicit() && !isa<ConstructorDecl>(D) &&
!isa<DestructorDecl>(D)) ||
isa<EnumCaseDecl>(D);
if (isa<ConstructorDecl>(D) || isa<DestructorDecl>(D))
return false;
return D->isImplicit() || isa<EnumCaseDecl>(D);
}
ProfilerRAII::ProfilerRAII(SILGenModule &SGM, AbstractFunctionDecl *D)
: SGM(SGM) {
: SGM(SGM), PreviousProfiler(std::move(SGM.Profiler)) {
const auto &Opts = SGM.M.getOptions();
if (!Opts.GenerateProfile || isUnmappedDecl(D))
return;
@@ -45,7 +46,7 @@ ProfilerRAII::ProfilerRAII(SILGenModule &SGM, AbstractFunctionDecl *D)
SGM.Profiler->assignRegionCounters(D);
}
ProfilerRAII::~ProfilerRAII() { SGM.Profiler = nullptr; }
ProfilerRAII::~ProfilerRAII() { SGM.Profiler = std::move(PreviousProfiler); }
namespace {