about summary refs log tree commit diff
path: root/src/librustc_codegen_ssa/back
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/librustc_codegen_ssa/back
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/librustc_codegen_ssa/back')
-rw-r--r--src/librustc_codegen_ssa/back/link.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index 2d65282ce77..7c153ba0d60 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -1700,7 +1700,7 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(
     }
 
     // OBJECT-FILES-NO, AUDIT-ORDER
-    if sess.opts.debugging_opts.control_flow_guard != CFGuard::Disabled {
+    if sess.opts.cg.control_flow_guard != CFGuard::Disabled {
         cmd.control_flow_guard();
     }