RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-03-04 08:37:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[LCG] Fix an assert in a on-scope-exit lambda that checked the contents

Browse Source 
of the returned value.

Checking the returned value from inside of a scoped exit isn't actually
valid. It happens to work when NRVO fires and the stars align, which
they reliably do with Clang but don't, for example, on MSVC builds.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@310547 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2017-08-10 03:05:21 +00:00
parent 8d76d00d95
commit 0302f3db41
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Analysis/LazyCallGraph.cpp
View File

@ -1105,14 +1105,10 @@ LazyCallGraph::RefSCC::removeInternalRefEdge(Node &SourceN,
// or we return new RefSCCs and this RefSCC is dead.
verify();
auto VerifyOnExit = make_scope_exit([&]() {
if (Result.empty()) {
// If we didn't replace our RefSCC with new ones, check that this one
// remains valid.
if (G)
verify();
} else {
assert(!G && "A dead RefSCC should have its graph pointer nulled.");
assert(SCCs.empty() && "A dead RefSCC should have no SCCs in it.");
for (RefSCC *RC : Result)
RC->verify();
}
});
#endif
@ -1325,6 +1321,12 @@ LazyCallGraph::RefSCC::removeInternalRefEdge(Node &SourceN,
SCCs.clear();
SCCIndices.clear();
#ifndef NDEBUG
// Verify the new RefSCCs we've built.
for (RefSCC *RC : Result)
RC->verify();
#endif
// Return the new list of SCCs.
return Result;
}