about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-07-11 06:28:04 +0000
committerbors <bors@rust-lang.org>2020-07-11 06:28:04 +0000
commit346aec9b02f3c74f3fce97fd6bda24709d220e49 (patch)
tree8ddad2b3c566486f44ea01f6305e1beeb11140f7 /src/test/codegen
parentdaecab3a784f28082df90cebb204998051f3557d (diff)
parent79fc3861dfd1190b257ef7f4208533c3945254b7 (diff)
downloadrust-346aec9b02f3c74f3fce97fd6bda24709d220e49.tar.gz
rust-346aec9b02f3c74f3fce97fd6bda24709d220e49.zip
Auto merge of #74235 - Manishearth:rollup-bgs3q14, r=Manishearth
Rollup of 19 pull requests

Successful merges:

 - #71322 (Accept tuple.0.0 as tuple indexing (take 2))
 - #72303 (Add core::future::{poll_fn, PollFn})
 - #73862 (Stabilize casts and coercions to `&[T]` in const fn)
 - #73887 (stabilize const mem::forget)
 - #73989 (adjust ub-enum test to be endianess-independent)
 - #74045 (Explain effects of debugging options from config.toml)
 - #74076 (Add `read_exact_at` and `write_all_at` to WASI's `FileExt`)
 - #74099 (Add VecDeque::range* methods)
 - #74100 (Use str::strip* in bootstrap)
 - #74103 (Only add CFGuard on `windows-msvc` targets)
 - #74109 (Only allow `repr(i128/u128)` on enum)
 - #74122 (Start-up clean-up)
 - #74125 (Correctly mark the ending span of a match arm)
 - #74127 (Avoid "whitelist")
 - #74129 (:arrow_up: rust-analyzer)
 - #74135 (Update books)
 - #74145 (Update rust-installer to latest version)
 - #74161 (Fix  disabled dockerfiles)
 - #74162 (take self by value in ToPredicate)

Failed merges:

r? @ghost
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/cfguard-checks.rs (renamed from src/test/codegen/cfguard_checks.rs)1
-rw-r--r--src/test/codegen/cfguard-disabled.rs (renamed from src/test/codegen/cfguard_disabled.rs)1
-rw-r--r--src/test/codegen/cfguard-nochecks.rs (renamed from src/test/codegen/cfguard_nochecks.rs)1
-rw-r--r--src/test/codegen/cfguard-non-msvc.rs11
4 files changed, 14 insertions, 0 deletions
diff --git a/src/test/codegen/cfguard_checks.rs b/src/test/codegen/cfguard-checks.rs
index 96f9158f9d3..96a0a321199 100644
--- a/src/test/codegen/cfguard_checks.rs
+++ b/src/test/codegen/cfguard-checks.rs
@@ -1,4 +1,5 @@
 // compile-flags: -Z 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 1325ffc0f25..925e4e8e2d1 100644
--- a/src/test/codegen/cfguard_disabled.rs
+++ b/src/test/codegen/cfguard-disabled.rs
@@ -1,4 +1,5 @@
 // compile-flags: -Z 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 ae1de4c4d26..d7dc3d7e89e 100644
--- a/src/test/codegen/cfguard_nochecks.rs
+++ b/src/test/codegen/cfguard-nochecks.rs
@@ -1,4 +1,5 @@
 // compile-flags: -Z 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
new file mode 100644
index 00000000000..4008f0187a0
--- /dev/null
+++ b/src/test/codegen/cfguard-non-msvc.rs
@@ -0,0 +1,11 @@
+// compile-flags: -Z control-flow-guard
+// ignore-msvc
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the cfguard module flag is not added for non-MSVC targets.
+// CHECK-NOT: !"cfguard"