From: Eric Rahm <ericrahm@gmail.com>
Date: Fri, 14 Jun 2019 17:58:39 +0000 (-0700)
Subject: Emit warning when trying to use PGO in conjunction with unwinding on Windows.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=74a39a39a4a0650d110083afa6e0b226f7b61ca9;p=rust.git

Emit warning when trying to use PGO in conjunction with unwinding on Windows.
---

diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 3cbf0ee213a..b17ba8de730 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
-    // an error to combine the two for now. It always runs into an assertions
+    // a warning 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.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.");
+        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.");
     }
 }