[PATCH] D50654: [WebAssembly] Don't make wasm cleanuppads into funclet entries
Heejin Ahn via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 13 11:30:32 PDT 2018
aheejin created this revision.
aheejin added reviewers: dschuff, majnemer.
Herald added subscribers: llvm-commits, sunfish, jgravelle-google, sbc100.
Catchpads and cleanuppads are not funclet entries; they are only EH
scope entries. We already dont't set `isEHFuncletEntry` for catchpads.
This patch does the same thing for cleanuppads.
Repository:
rL LLVM
https://reviews.llvm.org/D50654
Files:
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
test/CodeGen/WebAssembly/exception.ll
Index: test/CodeGen/WebAssembly/exception.ll
===================================================================
--- test/CodeGen/WebAssembly/exception.ll
+++ test/CodeGen/WebAssembly/exception.ll
@@ -165,8 +165,8 @@
; CHECK: call foo at FUNCTION
; CHECK: catch_all
; TODO These two should be removed too in a later patch
-; CHECK-NO T: get_global $push{{.+}}=, __stack_pointer at GLOBAL
-; CHECK-NO T: set_global __stack_pointer at GLOBAL, $pop{{.+}}
+; CHECK-NOT: get_global $push{{.+}}=, __stack_pointer at GLOBAL
+; CHECK-NOT: set_global __stack_pointer at GLOBAL, $pop{{.+}}
; CHECK: call __cxa_end_catch at FUNCTION
; CHECK-NOT: set_global __stack_pointer at GLOBAL, $pop{{.+}}
; CHECK: end_try
Index: lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
===================================================================
--- lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -1437,8 +1437,11 @@
// Don't emit any special code for the cleanuppad instruction. It just marks
// the start of an EH scope/funclet.
FuncInfo.MBB->setIsEHScopeEntry();
- FuncInfo.MBB->setIsEHFuncletEntry();
- FuncInfo.MBB->setIsCleanupFuncletEntry();
+ auto Pers = classifyEHPersonality(FuncInfo.Fn->getPersonalityFn());
+ if (Pers != EHPersonality::Wasm_CXX) {
+ FuncInfo.MBB->setIsEHFuncletEntry();
+ FuncInfo.MBB->setIsCleanupFuncletEntry();
+ }
}
/// When an invoke or a cleanupret unwinds to the next EH pad, there are
@@ -1458,6 +1461,7 @@
classifyEHPersonality(FuncInfo.Fn->getPersonalityFn());
bool IsMSVCCXX = Personality == EHPersonality::MSVC_CXX;
bool IsCoreCLR = Personality == EHPersonality::CoreCLR;
+ bool IsWasmCXX = Personality == EHPersonality::Wasm_CXX;
bool IsSEH = isAsynchronousEHPersonality(Personality);
while (EHPadBB) {
@@ -1472,7 +1476,8 @@
// personalities.
UnwindDests.emplace_back(FuncInfo.MBBMap[EHPadBB], Prob);
UnwindDests.back().first->setIsEHScopeEntry();
- UnwindDests.back().first->setIsEHFuncletEntry();
+ if (!IsWasmCXX)
+ UnwindDests.back().first->setIsEHFuncletEntry();
break;
} else if (auto *CatchSwitch = dyn_cast<CatchSwitchInst>(Pad)) {
// Add the catchpad handlers to the possible destinations.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D50654.160410.patch
Type: text/x-patch
Size: 2288 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180813/85c6cbda/attachment.bin>
More information about the llvm-commits
mailing list