about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWesley Wiser <wwiser@gmail.com>2019-07-11 21:50:00 -0400
committerWesley Wiser <wwiser@gmail.com>2019-07-11 21:50:00 -0400
commit374daa7985ec779b1c674fdab2e04e47f4c4094e (patch)
tree8baea3c73b6861845de94c33884121783ef8ce17
parente31911ef8f1f46b7fab6e4f350679822ac7d7f6a (diff)
downloadrust-374daa7985ec779b1c674fdab2e04e47f4c4094e.tar.gz
rust-374daa7985ec779b1c674fdab2e04e47f4c4094e.zip
Revert "Emit warning when trying to use PGO in conjunction with unwinding on Windows."
This reverts commit 74a39a39a4a0650d110083afa6e0b226f7b61ca9.
-rw-r--r--src/librustc/session/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index b17ba8de730..3cbf0ee213a 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -1303,15 +1303,15 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
     }
 
     // PGO does not work reliably with panic=unwind on Windows. Let's make it
-    // a warning to combine the two for now. It always runs into an assertions
+    // an error to combine the two for now. It always runs into an assertions
     // if LLVM is built with assertions, but without assertions it sometimes
     // does not crash and will probably generate a corrupted binary.
     if sess.opts.cg.profile_generate.enabled() &&
        sess.target.target.options.is_like_msvc &&
        sess.panic_strategy() == PanicStrategy::Unwind {
-        sess.warn("Profile-guided optimization does not yet work in conjunction \
-                   with `-Cpanic=unwind` on Windows when targeting MSVC. \
-                   See https://github.com/rust-lang/rust/issues/61002 for details.");
+        sess.err("Profile-guided optimization does not yet work in conjunction \
+                  with `-Cpanic=unwind` on Windows when targeting MSVC. \
+                  See https://github.com/rust-lang/rust/issues/61002 for details.");
     }
 }