From: Fangrui Song Date: Wed, 20 Jul 2022 04:25:55 +0000 (-0700) Subject: [X86][test] Use Min behavior for "cf-protection-{branch,return}" tests X-Git-Tag: upstream/15.0.7~1125 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad94b5c54f82e7bddc4253ccbf0bdaa9442411cf;p=platform%2Fupstream%2Fllvm.git [X86][test] Use Min behavior for "cf-protection-{branch,return}" tests The behavior does not match that much. Min is the new Clang codegen behavior since D130065. --- diff --git a/llvm/test/CodeGen/X86/fentry-ibt.ll b/llvm/test/CodeGen/X86/fentry-ibt.ll index 5ab84ae9743c..dc661b61ddfc 100644 --- a/llvm/test/CodeGen/X86/fentry-ibt.ll +++ b/llvm/test/CodeGen/X86/fentry-ibt.ll @@ -14,4 +14,4 @@ entry: !llvm.module.flags = !{!0} attributes #0 = { "fentry-call"="true" } -!0 = !{i32 4, !"cf-protection-branch", i32 1} +!0 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll index c60d7486db24..48b9855a8ba6 100644 --- a/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll +++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-cm-lager.ll @@ -31,6 +31,6 @@ entry: !llvm.module.flags = !{!0, !1, !2, !3} !0 = !{i32 1, !"wchar_size", i32 4} -!1 = !{i32 4, !"cf-protection-return", i32 1} -!2 = !{i32 4, !"cf-protection-branch", i32 1} +!1 = !{i32 8, !"cf-protection-return", i32 1} +!2 = !{i32 8, !"cf-protection-branch", i32 1} !3 = !{i32 1, !"Code Model", i32 4} diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll index 822376c2284d..8403d4b754d8 100644 --- a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll +++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh.ll @@ -91,4 +91,4 @@ try.cont: !llvm.module.flags = !{!0} -!0 = !{i32 4, !"cf-protection-branch", i32 1} +!0 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll index 8fab07e61540..64d44d9711cb 100644 --- a/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll +++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-eh2.ll @@ -143,5 +143,5 @@ declare dso_local void @__cxa_end_catch() !llvm.module.flags = !{!0, !1, !2} !0 = !{i32 1, !"wchar_size", i32 4} -!1 = !{i32 4, !"cf-protection-return", i32 1} -!2 = !{i32 4, !"cf-protection-branch", i32 1} +!1 = !{i32 8, !"cf-protection-return", i32 1} +!2 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll index 9ddabaa24cd4..c9978d64f1c9 100644 --- a/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll +++ b/llvm/test/CodeGen/X86/indirect-branch-tracking-r2.ll @@ -72,5 +72,5 @@ attributes #1 = { returns_twice } !llvm.module.flags = !{!0, !1, !2} !0 = !{i32 1, !"wchar_size", i32 4} -!1 = !{i32 4, !"cf-protection-return", i32 1} -!2 = !{i32 4, !"cf-protection-branch", i32 1} +!1 = !{i32 8, !"cf-protection-return", i32 1} +!2 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/indirect-branch-tracking.ll b/llvm/test/CodeGen/X86/indirect-branch-tracking.ll index 402063bbbe33..d4b0ed3aae69 100644 --- a/llvm/test/CodeGen/X86/indirect-branch-tracking.ll +++ b/llvm/test/CodeGen/X86/indirect-branch-tracking.ll @@ -220,4 +220,4 @@ try.cont: !llvm.module.flags = !{!0} -!0 = !{i32 4, !"cf-protection-branch", i32 1} +!0 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/nocf_check.ll b/llvm/test/CodeGen/X86/nocf_check.ll index 41990ddbe479..d6c6edea55e1 100644 --- a/llvm/test/CodeGen/X86/nocf_check.ll +++ b/llvm/test/CodeGen/X86/nocf_check.ll @@ -49,4 +49,4 @@ attributes #2 = { nocf_check } !llvm.module.flags = !{!0} -!0 = !{i32 4, !"cf-protection-branch", i32 1} +!0 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/note-cet-property.ll b/llvm/test/CodeGen/X86/note-cet-property.ll index ea5ec9609d2f..fe4a9c7e7e74 100644 --- a/llvm/test/CodeGen/X86/note-cet-property.ll +++ b/llvm/test/CodeGen/X86/note-cet-property.ll @@ -29,5 +29,5 @@ !llvm.module.flags = !{!0, !1} -!0 = !{i32 4, !"cf-protection-return", i32 1} -!1 = !{i32 4, !"cf-protection-branch", i32 1} +!0 = !{i32 8, !"cf-protection-return", i32 1} +!1 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll b/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll index b22b159abdb0..9d1db9cd6b08 100644 --- a/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll +++ b/llvm/test/CodeGen/X86/patchable-function-entry-ibt.ll @@ -85,4 +85,4 @@ entry: !llvm.module.flags = !{!0} -!0 = !{i32 4, !"cf-protection-branch", i32 1} +!0 = !{i32 8, !"cf-protection-branch", i32 1} diff --git a/llvm/test/CodeGen/X86/shadow-stack.ll b/llvm/test/CodeGen/X86/shadow-stack.ll index d8a58da3013d..bf0a00732b88 100644 --- a/llvm/test/CodeGen/X86/shadow-stack.ll +++ b/llvm/test/CodeGen/X86/shadow-stack.ll @@ -235,4 +235,4 @@ declare i32 @llvm.eh.sjlj.setjmp(ptr) !llvm.module.flags = !{!0} -!0 = !{i32 4, !"cf-protection-return", i32 1} +!0 = !{i32 8, !"cf-protection-return", i32 1} diff --git a/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir b/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir index 9536ba1dbc23..842b1fa949fe 100644 --- a/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir +++ b/llvm/test/CodeGen/X86/sjlj-shadow-stack-liveness.mir @@ -6,7 +6,7 @@ !llvm.module.flags = !{!0} - !0 = !{i32 4, !"cf-protection-return", i32 1} + !0 = !{i32 8, !"cf-protection-return", i32 1} ... --- name: bar