sgraenitz updated this revision to Diff 437180.
sgraenitz added a comment.
Drop GNUstep assertion from getBundlesForFunclet(). Indeed a similar issue was
observed before. See: D44640 <https://reviews.llvm.org/D44640>
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D124762/new/
https://reviews.llvm.org/D124762
Files:
clang/lib/CodeGen/CGCall.cpp
clang/test/CodeGenObjCXX/arc-exceptions-seh.mm
llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp
llvm/lib/CodeGen/WinEHPrepare.cpp
llvm/test/CodeGen/X86/win64-funclet-preisel-intrinsics.ll
Index: llvm/test/CodeGen/X86/win64-funclet-preisel-intrinsics.ll
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/X86/win64-funclet-preisel-intrinsics.ll
@@ -0,0 +1,68 @@
+; RUN: llc -mtriple=x86_64-windows-msvc < %s | FileCheck %s
+
+; Reduced IR generated from ObjC++ source:
+;
+; @class Ety;
+; void opaque(void);
+; void test_catch(void) {
+; @try {
+; opaque();
+; } @catch (Ety *ex) {
+; // Destroy ex when leaving catchpad. This emits calls to two intrinsic
+; // functions, llvm.objc.retain and llvm.objc.storeStrong, but only one
+; // is required to trigger the funclet truncation.
+; }
+; }
+
+define void @test_catch() personality ptr @__CxxFrameHandler3 {
+entry:
+ %exn.slot = alloca ptr, align 8
+ %ex2 = alloca ptr, align 8
+ invoke void @opaque() to label %invoke.cont unwind label %catch.dispatch
+
+catch.dispatch:
+ %0 = catchswitch within none [label %catch] unwind to caller
+
+invoke.cont:
+ unreachable
+
+catch:
+ %1 = catchpad within %0 [ptr null, i32 64, ptr %exn.slot]
+ call void @llvm.objc.storeStrong(ptr %ex2, ptr null) [ "funclet"(token %1) ]
+ catchret from %1 to label %catchret.dest
+
+catchret.dest:
+ ret void
+}
+
+declare void @opaque()
+declare void @llvm.objc.storeStrong(ptr, ptr) #0
+declare i32 @__CxxFrameHandler3(...)
+
+attributes #0 = { nounwind }
+
+; llvm.objc.storeStrong is a Pre-ISel intrinsic, which used to cause truncations
+; when it occurred in SEH funclets like catchpads:
+; CHECK: # %catch
+; CHECK: pushq %rbp
+; CHECK: .seh_pushreg %rbp
+; ...
+; CHECK: .seh_endprologue
+;
+; At this point the code used to be truncated (and sometimes terminated with an
+; int3 opcode):
+; CHECK-NOT: int3
+;
+; Instead, the call to objc_storeStrong should be emitted:
+; CHECK: leaq -24(%rbp), %rcx
+; CHECK: xorl %edx, %edx
+; CHECK: callq objc_storeStrong
+; ...
+;
+; This is the end of the funclet:
+; CHECK: popq %rbp
+; CHECK: retq # CATCHRET
+; ...
+; CHECK: .seh_handlerdata
+; ...
+; CHECK: .seh_endproc
Index: llvm/lib/CodeGen/WinEHPrepare.cpp
===================================================================
--- llvm/lib/CodeGen/WinEHPrepare.cpp
+++ llvm/lib/CodeGen/WinEHPrepare.cpp
@@ -963,7 +963,7 @@
if (auto BU = CB->getOperandBundle(LLVMContext::OB_funclet))
FuncletBundleOperand = BU->Inputs.front();
- if (FuncletBundleOperand == FuncletPad)
+ if (!FuncletPad || FuncletBundleOperand == FuncletPad)
continue;
// Skip call sites which are nounwind intrinsics or inline asm.
Index: llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp
===================================================================
--- llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp
+++ llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp
@@ -107,7 +107,9 @@
IRBuilder<> Builder(CI->getParent(), CI->getIterator());
SmallVector<Value *, 8> Args(CI->args());
- CallInst *NewCI = Builder.CreateCall(FCache, Args);
+ SmallVector<llvm::OperandBundleDef, 1> BundleList;
+ CI->getOperandBundlesAsDefs(BundleList);
+ CallInst *NewCI = Builder.CreateCall(FCache, Args, BundleList);
NewCI->setName(CI->getName());
// Try to set the most appropriate TailCallKind based on both the current
Index: clang/test/CodeGenObjCXX/arc-exceptions-seh.mm
===================================================================
--- /dev/null
+++ clang/test/CodeGenObjCXX/arc-exceptions-seh.mm
@@ -0,0 +1,23 @@
+// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc -emit-llvm -fobjc-arc -fexceptions -fobjc-exceptions -fobjc-runtime=gnustep-2.0 -o - %s | FileCheck %s
+
+@class Ety;
+void opaque(void);
+void test_catch_preisel_intrinsic(void) {
+ @try {
+ opaque();
+ } @catch (Ety *ex) {
+ // Destroy ex when leaving catchpad. Emits calls to two intrinsic functions,
+ // that should both have a "funclet" bundle operand that refers to the
+ // catchpad's SSA value.
+ }
+}
+
+// CHECK-LABEL: define{{.*}} void {{.*}}test_catch_preisel_intrinsic
+// ...
+// CHECK: catch.dispatch:
+// CHECK-NEXT: [[CATCHSWITCH:%[0-9]+]] = catchswitch within none
+// ...
+// CHECK: catch:
+// CHECK-NEXT: [[CATCHPAD:%[0-9]+]] = catchpad within [[CATCHSWITCH]]
+// CHECK: {{%[0-9]+}} = call {{.*}} @llvm.objc.retain{{.*}} [ "funclet"(token [[CATCHPAD]]) ]
+// CHECK: call {{.*}} @llvm.objc.storeStrong{{.*}} [ "funclet"(token [[CATCHPAD]]) ]
Index: clang/lib/CodeGen/CGCall.cpp
===================================================================
--- clang/lib/CodeGen/CGCall.cpp
+++ clang/lib/CodeGen/CGCall.cpp
@@ -25,11 +25,13 @@
#include "clang/AST/DeclCXX.h"
#include "clang/AST/DeclObjC.h"
#include "clang/Basic/CodeGenOptions.h"
+#include "clang/Basic/ObjCRuntime.h"
#include "clang/Basic/TargetBuiltins.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/CodeGen/CGFunctionInfo.h"
#include "clang/CodeGen/SwiftCallingConv.h"
#include "llvm/ADT/StringExtras.h"
+#include "llvm/Analysis/ObjCARCInstKind.h"
#include "llvm/Analysis/ValueTracking.h"
#include "llvm/IR/Assumptions.h"
#include "llvm/IR/Attributes.h"
@@ -4465,16 +4467,33 @@
CodeGenFunction::getBundlesForFunclet(llvm::Value *Callee) {
SmallVector<llvm::OperandBundleDef, 1> BundleList;
// There is no need for a funclet operand bundle if we aren't inside a
- // funclet.
+ // funclet or the callee is not a function.
if (!CurrentFuncletPad)
return BundleList;
- // Skip intrinsics which cannot throw.
- auto *CalleeFn = dyn_cast<llvm::Function>(Callee->stripPointerCasts());
- if (CalleeFn && CalleeFn->isIntrinsic() && CalleeFn->doesNotThrow())
- return BundleList;
+ bool InsertFuncletOp = true;
+ if (auto *CalleeFn = dyn_cast<llvm::Function>(Callee->stripPointerCasts())) {
+ // Skip intrinsics which cannot throw.
+ if (CalleeFn->isIntrinsic() && CalleeFn->doesNotThrow())
+ InsertFuncletOp = false;
+
+ // Most ObjC ARC intrinics are lowered in PreISelIntrinsicLowering. Thus,
+ // WinEHPrepare will see them as regular calls. We need to set the funclet
+ // operand explicitly in this case to avoid accidental truncation of EH
+ // funclets on Windows.
+ if (CalleeFn->isIntrinsic() && CalleeFn->doesNotThrow()) {
+ if (CGM.getTarget().getTriple().isOSWindows()) {
+ using namespace llvm::objcarc;
+ ARCInstKind CalleeKind = GetFunctionClass(CalleeFn);
+ if (!IsUser(CalleeKind) && CalleeKind != ARCInstKind::None)
+ InsertFuncletOp = true;
+ }
+ }
+ }
+
+ if (InsertFuncletOp)
+ BundleList.emplace_back("funclet", CurrentFuncletPad);
- BundleList.emplace_back("funclet", CurrentFuncletPad);
return BundleList;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
