LLVM crash

src/librustc/Cargo.toml

@@ -57,12 +57,6 @@ lazy_static = "1.0.0"
 #        compiles, then please feel free to do so!
 flate2 = "0.2"
 
-[target.'cfg(target_arch = "x86")'.dependencies]
-x86 = { git = "https://github.com/gz/rust-x86.git" }
-
-[target.'cfg(target_arch = "x86_64")'.dependencies]
-x86 = { git = "https://github.com/gz/rust-x86.git" }
-
 [target.'cfg(windows)'.dependencies]
 kernel32-sys = "0.2.2"
 winapi = "0.2.8"

src/librustc/lib.rs

@@ -40,6 +40,7 @@
        html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![deny(warnings)]
 
+#![feature(asm)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(conservative_impl_trait)]
@@ -82,7 +83,6 @@ extern crate libc;
 extern crate kernel32;
 #[cfg(windows)]
 extern crate winapi;
-extern crate x86;
 extern crate owning_ref;
 extern crate rustc_back;
 #[macro_use] extern crate rustc_data_structures;

src/librustc/util/common.rs

@@ -160,10 +160,22 @@ fn time_threads_impl<T, F>(what: &str, f: F) -> T where
 {
     use rayon_core::registry;
     use std::iter;
-    use x86;
     use winapi;
     use kernel32;
 
+    #[allow(unused_mut)]
+    fn read_counter() -> u64 {
+        let mut low: u32;
+        let mut high: u32;
+
+        unsafe {
+            asm!("xor %%rax, %%rax; cpuid; rdtsc"
+                : "={eax}" (low), "={edx}" (high) :: "memory,rbx,rcx");
+        }
+
+        ((high as u64) << 32) | (low as u64)
+    }
+
     let registry = registry::get_current_registry();
     if let Some(registry) = registry {
         let freq = unsafe {
@@ -186,9 +198,10 @@ fn time_threads_impl<T, F>(what: &str, f: F) -> T where
                 assert!(kernel32::QueryThreadCycleTime(handle, &mut begin[i]) == winapi::TRUE);
             }
         }
-        let time_start = unsafe { x86::shared::time::rdtsc() };
+
+        let time_start = read_counter();
         let result = f();
-        let time_end = unsafe { x86::shared::time::rdtsc() };
+        let time_end = read_counter();
         for (i, &handle) in threads.iter().enumerate() {
             unsafe {
                 assert!(kernel32::QueryThreadCycleTime(handle, &mut end[i]) == winapi::TRUE);

src/librustc_driver/driver.rs

@@ -787,9 +787,13 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
         let mut ecx = ExtCtxt::new(&sess.parse_sess, cfg, &mut resolver);
         let err_count = ecx.parse_sess.span_diagnostic.err_count();
 
-        let krate = ecx.monotonic_expander().expand_crate(krate);
+        let krate = time(time_passes, "expand crate", || {
+            ecx.monotonic_expander().expand_crate(krate);
+        });
 
-        ecx.check_unused_macros();
+        time(time_passes, "check unused macros", || {
+            ecx.check_unused_macros();
+        });
 
         let mut missing_fragment_specifiers: Vec<_> =
             ecx.parse_sess.missing_fragment_specifiers.borrow().iter().cloned().collect();