In the future Windows will enable Control-flow Enforcement Technology (CET aka shadow stacks). To protect the path where the context is updated during exception handling, the binary is required to enumerate valid unwind entrypoints in a dedicated section which is validated when the context is being set during exception handling. This change allows llvm to generate the section that contains the appropriate symbol references in the form expected by the msvc linker. This feature is enabled through a new module flag, ehcontguard, which was modelled on the cfguard flag. The change includes a test that when the module flag is enabled the section is correctly generated. The set of exception continuation information includes returns from exceptional control flow (catchret in llvm). In order to collect catchret we: 1) Includes an additional flag on machine basic blocks to indicate that the given block is the target of a catchret operation, 2) Introduces a new machine function pass to insert and collect symbols at the start of each block, and 3) Combines these targets with the other EHCont targets that were already being collected. Change originally authored by Daniel Frampton <dframpto@microsoft.com> For more details, see MSVC documentation for `/guard:ehcont` https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-eh-continuation-metadata Reviewed By: pengfei Differential Revision: https://reviews.llvm.org/D94835
45 lines
1.2 KiB
LLVM
45 lines
1.2 KiB
LLVM
; RUN: llc -mtriple=x86_64-pc-windows-coreclr < %s | FileCheck %s
|
|
|
|
declare void @ProcessCLRException()
|
|
|
|
declare void @f()
|
|
|
|
define void @test1() personality void ()* @ProcessCLRException {
|
|
entry:
|
|
invoke void @f()
|
|
to label %exit unwind label %catch.dispatch.1
|
|
exit:
|
|
ret void
|
|
|
|
catch.dispatch.1:
|
|
%cs1 = catchswitch within none [label %outer.catch] unwind to caller
|
|
|
|
outer.catch:
|
|
%cp1 = catchpad within %cs1 [i32 1]
|
|
invoke void @f() [ "funclet"(token %cp1) ]
|
|
to label %outer.ret unwind label %catch.dispatch.2
|
|
outer.ret:
|
|
catchret from %cp1 to label %exit
|
|
|
|
catch.dispatch.2:
|
|
%cs2 = catchswitch within %cp1 [label %inner.catch] unwind to caller
|
|
inner.catch:
|
|
%cp2 = catchpad within %cs2 [i32 2]
|
|
catchret from %cp2 to label %outer.ret
|
|
}
|
|
|
|
; Check the catchret targets
|
|
; CHECK-LABEL: test1: # @test1
|
|
; CHECK: [[Exit:^[^: ]+]]: # Block address taken
|
|
; CHECK-NEXT: # %exit
|
|
; CHECK-NEXT: $ehgcr_0_1:
|
|
; CHECK: [[OuterRet:^[^: ]+]]: # Block address taken
|
|
; CHECK-NEXT: # %outer.ret
|
|
; CHECK-NEXT: $ehgcr_0_3:
|
|
; CHECK-NEXT: leaq [[Exit]](%rip), %rax
|
|
; CHECK: retq # CATCHRET
|
|
; CHECK: {{^[^: ]+}}: # %inner.catch
|
|
; CHECK: .seh_endprolog
|
|
; CHECK-NEXT: leaq [[OuterRet]](%rip), %rax
|
|
; CHECK: retq # CATCHRET
|