[SEH] Use cleanupendpad so that WinEHPrepare gets the coloring right
Cleanupendpad is a lot like catchendpad, so we can reuse the same
EHScopeStack type.
llvm-svn: 247349
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp
index 1a20403..255cb84 100644
--- a/clang/lib/CodeGen/CGException.cpp
+++ b/clang/lib/CodeGen/CGException.cpp
@@ -601,8 +601,8 @@
dispatchBlock = getTerminateHandler();
break;
- case EHScope::CatchEnd:
- llvm_unreachable("CatchEnd unnecessary for Itanium!");
+ case EHScope::PadEnd:
+ llvm_unreachable("PadEnd unnecessary for Itanium!");
}
scope.setCachedEHDispatchBlock(dispatchBlock);
}
@@ -645,8 +645,8 @@
DispatchBlock->setName("terminate");
break;
- case EHScope::CatchEnd:
- llvm_unreachable("CatchEnd dispatch block missing!");
+ case EHScope::PadEnd:
+ llvm_unreachable("PadEnd dispatch block missing!");
}
EHS.setCachedEHDispatchBlock(DispatchBlock);
return DispatchBlock;
@@ -662,7 +662,7 @@
case EHScope::Filter:
case EHScope::Catch:
case EHScope::Terminate:
- case EHScope::CatchEnd:
+ case EHScope::PadEnd:
return false;
}
@@ -721,8 +721,8 @@
case EHScope::Terminate:
return getTerminateLandingPad();
- case EHScope::CatchEnd:
- llvm_unreachable("CatchEnd unnecessary for Itanium!");
+ case EHScope::PadEnd:
+ llvm_unreachable("PadEnd unnecessary for Itanium!");
case EHScope::Catch:
case EHScope::Cleanup:
@@ -790,8 +790,8 @@
case EHScope::Catch:
break;
- case EHScope::CatchEnd:
- llvm_unreachable("CatchEnd unnecessary for Itanium!");
+ case EHScope::PadEnd:
+ llvm_unreachable("PadEnd unnecessary for Itanium!");
}
EHCatchScope &catchScope = cast<EHCatchScope>(*I);
@@ -1028,7 +1028,7 @@
isa<CXXConstructorDecl>(CurCodeDecl);
if (CatchEndBlockBB)
- EHStack.pushCatchEnd(CatchEndBlockBB);
+ EHStack.pushPadEnd(CatchEndBlockBB);
// Perversely, we emit the handlers backwards precisely because we
// want them to appear in source order. In all of these cases, the
@@ -1083,7 +1083,7 @@
EmitBlock(ContBB);
incrementProfileCounter(&S);
if (CatchEndBlockBB)
- EHStack.popCatchEnd();
+ EHStack.popPadEnd();
}
namespace {
@@ -1397,8 +1397,10 @@
namespace {
struct PerformSEHFinally final : EHScopeStack::Cleanup {
llvm::Function *OutlinedFinally;
- PerformSEHFinally(llvm::Function *OutlinedFinally)
- : OutlinedFinally(OutlinedFinally) {}
+ EHScopeStack::stable_iterator EnclosingScope;
+ PerformSEHFinally(llvm::Function *OutlinedFinally,
+ EHScopeStack::stable_iterator EnclosingScope)
+ : OutlinedFinally(OutlinedFinally), EnclosingScope(EnclosingScope) {}
void Emit(CodeGenFunction &CGF, Flags F) override {
ASTContext &Context = CGF.getContext();
@@ -1423,7 +1425,28 @@
CGM.getTypes().arrangeFreeFunctionCall(Args, FPT,
/*chainCall=*/false);
+ // If this is the normal cleanup or using the old EH IR, just emit the call.
+ if (!F.isForEHCleanup() || !CGM.getCodeGenOpts().NewMSEH) {
+ CGF.EmitCall(FnInfo, OutlinedFinally, ReturnValueSlot(), Args);
+ return;
+ }
+
+ // Build a cleanupendpad to unwind through.
+ llvm::BasicBlock *CleanupBB = CGF.Builder.GetInsertBlock();
+ llvm::BasicBlock *CleanupEndBB = CGF.createBasicBlock("ehcleanup.end");
+ llvm::Instruction *PadInst = CleanupBB->getFirstNonPHI();
+ auto *CPI = cast<llvm::CleanupPadInst>(PadInst);
+ CGBuilderTy(CGF, CleanupEndBB)
+ .CreateCleanupEndPad(CPI, CGF.getEHDispatchBlock(EnclosingScope));
+
+ // Push and pop the cleanupendpad around the call.
+ CGF.EHStack.pushPadEnd(CleanupEndBB);
CGF.EmitCall(FnInfo, OutlinedFinally, ReturnValueSlot(), Args);
+ CGF.EHStack.popPadEnd();
+
+ // Insert the catchendpad block here.
+ CGF.CurFn->getBasicBlockList().insertAfter(CGF.Builder.GetInsertBlock(),
+ CleanupEndBB);
}
};
}
@@ -1779,7 +1802,8 @@
HelperCGF.GenerateSEHFinallyFunction(*this, *Finally);
// Push a cleanup for __finally blocks.
- EHStack.pushCleanup<PerformSEHFinally>(NormalAndEHCleanup, FinallyFunc);
+ EHStack.pushCleanup<PerformSEHFinally>(NormalAndEHCleanup, FinallyFunc,
+ EHStack.getInnermostEHScope());
return;
}