about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2016-03-23 17:59:16 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2016-03-23 17:59:16 +0200
commit3fd144db0d4b8cf0609c48031c9caaa9d5cb3f1e (patch)
tree295a657bfb57e2b88b2263f1a61ea0aa49a229e8
parent2acad9c17edbdecf8060324ba11768b0a9c7c635 (diff)
parent424fa432d4fd15d1bbf9f6b4fa3ed56074f81cde (diff)
Rollup merge of #32437 - eddyb:orbital-msvc, r=alexcrichton
Annotate run-pass/backtrace with #[rustc_no_mir] on MSVC.

Fixes #32384 by not using MIR on MSVC for the functions in the path of the backtrace.
This is the known blocker for the MSVC MIR builder, hopefully the only one overall.
r? @alexcrichton Confirmed to work on a nightly, by @retep998.
-rw-r--r--src/test/run-pass/backtrace.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs
index 3fb52f8c8b4..2a98706351a 100644
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/run-pass/backtrace.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(rustc_attrs)]
+
 // no-pretty-expanded FIXME #15189
 // ignore-android FIXME #17520
 // compile-flags:-g
@@ -16,6 +18,8 @@ use std::env;
 use std::process::{Command, Stdio};
 use std::str;
 
+// FIXME #31005 MIR missing debuginfo currently.
+#[cfg_attr(target_env = "msvc", rustc_no_mir)]
 #[inline(never)]
 fn foo() {
     let _v = vec![1, 2, 3];
@@ -24,6 +28,8 @@ fn foo() {
     }
 }
 
+// FIXME #31005 MIR missing debuginfo currently.
+#[cfg_attr(target_env = "msvc", rustc_no_mir)]
 #[inline(never)]
 fn double() {
     struct Double;