diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-22 15:31:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-22 15:41:51 (GMT) |
| commit | 5d85fb4f407cd661fb904f68e2c9cc27ddcc0331 (patch) | |
| tree | c9955ec515ddd96a35def323fd3a16a15a6dccec /Source/cmMakefile.cxx | |
| parent | 3a65606591818281ba75bac4751e07c69751451f (diff) | |
| download | CMake-5d85fb4f407cd661fb904f68e2c9cc27ddcc0331.zip CMake-5d85fb4f407cd661fb904f68e2c9cc27ddcc0331.tar.gz CMake-5d85fb4f407cd661fb904f68e2c9cc27ddcc0331.tar.bz2 | |
Fix assertion failure on unmatched function or macro
The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach
in function, 2015-05-18) broke handling of unmatched non-loop blocks
because it assumed all function blockers removed during error unwinding
were for loops, essentially switching the set of mishandled cases.
The purpose of the loop block push/pop operations is to define a scope
matching the lifetime of the loop function blockers. Since our function
blockers already have the proper lifetime, simply move the push/pop
operations to their constructor/destructor.
Extend the RunCMake.Syntax test with a case covering this.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 61a175c..ba914e1 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3284,7 +3284,6 @@ void cmMakefile::PopFunctionBlockerBarrier(bool reportError) this->FunctionBlockerBarriers.back(); while(this->FunctionBlockers.size() > barrier) { - cmMakefile::LoopBlockPop loopBlockPop(this); cmsys::auto_ptr<cmFunctionBlocker> fb(this->FunctionBlockers.back()); this->FunctionBlockers.pop_back(); if(reportError) |