about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2020-07-22 09:29:03 -0700
committerGitHub <noreply@github.com>2020-07-22 09:29:03 -0700
commit8afb305e7200b05dacf6129e2c10575f4ca6ebb0 (patch)
tree5d25bf8d67377f1d0d676f6bd3984bbe5fef32b1 /src/test/codegen
parentdade0f1f6c25dde9974b61b76f0e9dc01cf3ea68 (diff)
parent31c7aae1136b4d80f0256e269ca8086fd3fbdddd (diff)
downloadrust-8afb305e7200b05dacf6129e2c10575f4ca6ebb0.tar.gz
rust-8afb305e7200b05dacf6129e2c10575f4ca6ebb0.zip
Rollup merge of #73893 - ajpaverd:cfguard-stabilize, r=nikomatsakis
Stabilize control-flow-guard codegen option

This is the stabilization PR discussed in #68793. It converts the `-Z control-flow-guard` debugging option into a codegen option (`-C control-flow-guard`), and changes the associated tests.
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/cfguard-checks.rs2
-rw-r--r--src/test/codegen/cfguard-disabled.rs2
-rw-r--r--src/test/codegen/cfguard-nochecks.rs2
-rw-r--r--src/test/codegen/cfguard-non-msvc.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/codegen/cfguard-checks.rs b/src/test/codegen/cfguard-checks.rs
index 96a0a321199..571a2654bcb 100644
--- a/src/test/codegen/cfguard-checks.rs
+++ b/src/test/codegen/cfguard-checks.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z control-flow-guard=checks
+// compile-flags: -C control-flow-guard=checks
 // only-msvc
 
 #![crate_type = "lib"]
diff --git a/src/test/codegen/cfguard-disabled.rs b/src/test/codegen/cfguard-disabled.rs
index 925e4e8e2d1..c3f8f411681 100644
--- a/src/test/codegen/cfguard-disabled.rs
+++ b/src/test/codegen/cfguard-disabled.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z control-flow-guard=no
+// compile-flags: -C control-flow-guard=no
 // only-msvc
 
 #![crate_type = "lib"]
diff --git a/src/test/codegen/cfguard-nochecks.rs b/src/test/codegen/cfguard-nochecks.rs
index d7dc3d7e89e..3847c3e81ed 100644
--- a/src/test/codegen/cfguard-nochecks.rs
+++ b/src/test/codegen/cfguard-nochecks.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z control-flow-guard=nochecks
+// compile-flags: -C control-flow-guard=nochecks
 // only-msvc
 
 #![crate_type = "lib"]
diff --git a/src/test/codegen/cfguard-non-msvc.rs b/src/test/codegen/cfguard-non-msvc.rs
index 4008f0187a0..6278a951e35 100644
--- a/src/test/codegen/cfguard-non-msvc.rs
+++ b/src/test/codegen/cfguard-non-msvc.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z control-flow-guard
+// compile-flags: -C control-flow-guard
 // ignore-msvc
 
 #![crate_type = "lib"]