aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-07-02 22:56:41 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-07-02 22:56:41 +0000
commit6068c48498e9af1076b1b5f2499e176e7e9c0f34 (patch)
tree8985e18a49bb4e5e37c869f95ee3e7514ee6ce65
parent769951f6cc6323821ce1e9f46a37817a541c884f (diff)
All glory to address sanitizer. ;]
It appears to have caught a use-after-free introduced as by r159567 and/or friends which call 'addPass' from many more places. The bug in 'addPass' doesn't appear to be new, and was spotted by inspection when ASan shown a bright light of a stacktrace at these functions. Hopefully this will fix the ASan failure -- I have no test case other than running an ASan-built clang over the test suite. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159614 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/CodeGen/Passes.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp
index 1fefb9d45f..9693780bda 100644
--- a/lib/CodeGen/Passes.cpp
+++ b/lib/CodeGen/Passes.cpp
@@ -280,11 +280,17 @@ AnalysisID TargetPassConfig::getPassSubstitution(AnalysisID ID) const {
void TargetPassConfig::addPass(Pass *P) {
assert(!Initialized && "PassConfig is immutable");
+ // Cache the Pass ID here in case the pass manager finds this pass is
+ // redundant with ones already scheduled / available, and deletes it.
+ // Fundamentally, once we add the pass to the manager, we no longer own it
+ // and shouldn't reference it.
+ AnalysisID PassID = P->getPassID();
+
if (Started && !Stopped)
PM->add(P);
- if (StopAfter == P->getPassID())
+ if (StopAfter == PassID)
Stopped = true;
- if (StartAfter == P->getPassID())
+ if (StartAfter == PassID)
Started = true;
if (Stopped && !Started)
report_fatal_error("Cannot stop compilation after pass that is not run");