diff options
| author | Akira Hatanaka <ahatanaka@apple.com> | 2018-04-27 05:56:55 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@apple.com> | 2018-04-27 05:56:55 +0000 |
| commit | b4f3637cec2f4b914528bc6b27d00b8317f7a995 (patch) | |
| tree | 572329429bcb082b4f16cb1db40e1d967476f1de /clang/lib/CodeGen/CGCleanup.cpp | |
| parent | 1f3e2b296602ca23c276e41439868b41c8de41ad (diff) | |
| download | bcm5719-llvm-b4f3637cec2f4b914528bc6b27d00b8317f7a995.tar.gz bcm5719-llvm-b4f3637cec2f4b914528bc6b27d00b8317f7a995.zip | |
Revert "[CodeGen] Avoid destructing a callee-destructued struct type in a"
This reverts commit r331016, which broke a windows bot.
http://lab.llvm.org:8011/builders/clang-x86-windows-msvc2015/builds/11727
llvm-svn: 331019
Diffstat (limited to 'clang/lib/CodeGen/CGCleanup.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGCleanup.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp index c5f935bdef5..526def2cc29 100644 --- a/clang/lib/CodeGen/CGCleanup.cpp +++ b/clang/lib/CodeGen/CGCleanup.cpp @@ -1233,10 +1233,8 @@ void CodeGenFunction::DeactivateCleanupBlock(EHScopeStack::stable_iterator C, EHCleanupScope &Scope = cast<EHCleanupScope>(*EHStack.find(C)); assert(Scope.isActive() && "double deactivation"); - // If it's the top of the stack, just pop it, but do so only if it belongs - // to the current RunCleanupsScope. - if (C == EHStack.stable_begin() && - CurrentCleanupScopeDepth.strictlyEncloses(C)) { + // If it's the top of the stack, just pop it. + if (C == EHStack.stable_begin()) { // If it's a normal cleanup, we need to pretend that the // fallthrough is unreachable. CGBuilderTy::InsertPoint SavedIP = Builder.saveAndClearIP(); |
