summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2011-02-25 04:19:13 +0000
committerJohn McCall <rjmccall@apple.com>2011-02-25 04:19:13 +0000
commit1b93f1ba9f77ab11d3fd8cefcb7ef11afb605a2c (patch)
treedf180f4404d1693c488fe454e04bb9c4e45a0e4c /clang/lib
parent14a07365cb78889ca417494e155aeeb00770214b (diff)
downloadbcm5719-llvm-1b93f1ba9f77ab11d3fd8cefcb7ef11afb605a2c.tar.gz
bcm5719-llvm-1b93f1ba9f77ab11d3fd8cefcb7ef11afb605a2c.zip
Tame an assert; the scope depth of a jump destination does not
necessarily enclose the innermost normal cleanup depth, because the top of the jump scope stack might be an EH cleanup or EH scope. Fixes PR9303. llvm-svn: 126472
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/CodeGen/CGCleanup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp
index 374ede880d2..1d7901a2db4 100644
--- a/clang/lib/CodeGen/CGCleanup.cpp
+++ b/clang/lib/CodeGen/CGCleanup.cpp
@@ -876,7 +876,7 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
///
/// As a side-effect, this method clears the insertion point.
void CodeGenFunction::EmitBranchThroughCleanup(JumpDest Dest) {
- assert(Dest.getScopeDepth().encloses(EHStack.getInnermostNormalCleanup())
+ assert(Dest.getScopeDepth().encloses(EHStack.stable_begin())
&& "stale jump destination");
if (!HaveInsertPoint())
OpenPOWER on IntegriCloud