commit 374ab25585f0a817fe7bd6986737f12347b12d0b (from 1add455ec6f81045e7651c6225902823f5d4fbfa)

Merge: 1add455ec6f8 497f879b1e24

Author: bors <bors@rust-lang.org>

Date:   Tue Mar 24 12:42:54 2020 +0000

    Auto merge of #70163 - nikic:llvm-10-preparation, r=cuviper

    Prepare for LLVM 10 upgrade

    This is #67759 minus the submodule update.

     * Fix two compatibility issues in the rustllvm wrapper.

     * Update data layout strings in tests.

     * Fix LLVM version comparison (this become a problem because the major version has two digits now).

    r? @cuviper

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs

index aa1d1b7c4241..b52fbe4666eb 100644

--- a/src/bootstrap/test.rs

+++ b/src/bootstrap/test.rs

@@ -1141,6 +1141,8 @@ impl Step for Compiletest {

             let llvm_config = builder.ensure(native::Llvm { target: builder.config.build });

             if !builder.config.dry_run {

                 let llvm_version = output(Command::new(&llvm_config).arg("--version"));

+                // Remove trailing newline from llvm-config output.

+                let llvm_version = llvm_version.trim_end();

                 cmd.arg("--llvm-version").arg(llvm_version);

             }

             if !builder.is_rust_llvm(target) {

diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp

index 90d24d20737d..9e8614e3b6d3 100644

--- a/src/rustllvm/PassWrapper.cpp

+++ b/src/rustllvm/PassWrapper.cpp

@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() {

 }

 extern "C" void LLVMTimeTraceProfilerInitialize() {

-#if LLVM_VERSION_GE(9, 0)

+#if LLVM_VERSION_GE(10, 0)

+  timeTraceProfilerInitialize(

+      /* TimeTraceGranularity */ 0,

+      /* ProcName */ "rustc");

+#elif LLVM_VERSION_GE(9, 0)

   timeTraceProfilerInitialize();

 #endif

 }

diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp

index 25cfee3373dc..799adb418822 100644

--- a/src/rustllvm/RustWrapper.cpp

+++ b/src/rustllvm/RustWrapper.cpp

@@ -1333,8 +1333,13 @@ extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B,

                                             LLVMValueRef Dst, unsigned DstAlign,

                                             LLVMValueRef Val,

                                             LLVMValueRef Size, bool IsVolatile) {

+#if LLVM_VERSION_GE(10, 0)

+  return wrap(unwrap(B)->CreateMemSet(

+      unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile));

+#else

   return wrap(unwrap(B)->CreateMemSet(

       unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile));

+#endif

 }

 extern "C" LLVMValueRef

diff --git a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json

index 8d028280a8da..00de3de05f07 100644

--- a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json

+++ b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json

@@ -1,5 +1,5 @@

 {

-    "data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",

+    "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",

     "linker-flavor": "gcc",

     "llvm-target": "i686-unknown-linux-gnu",

     "target-endian": "little",

diff --git a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json

index 48040ae3da0e..6d5e964ed4fe 100644

--- a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json

+++ b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json

@@ -1,6 +1,6 @@

 {

     "pre-link-args": {"gcc": ["-m64"]},

-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",

+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",

     "linker-flavor": "gcc",

     "llvm-target": "x86_64-unknown-linux-gnu",

     "target-endian": "little",

diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs

index 2a24a8c3c948..cb648db8830e 100644

--- a/src/tools/compiletest/src/header.rs

+++ b/src/tools/compiletest/src/header.rs

@@ -191,6 +191,7 @@ impl EarlyProps {

                 return true;

             }

             if let Some(ref actual_version) = config.llvm_version {

+                let actual_version = version_to_int(actual_version);

                 if line.starts_with("min-llvm-version") {

                     let min_version = line

                         .trim_end()

@@ -199,7 +200,7 @@ impl EarlyProps {

                         .expect("Malformed llvm version directive");

                     // Ignore if actual version is smaller the minimum required

                     // version

-                    &actual_version[..] < min_version

+                    actual_version < version_to_int(min_version)

                 } else if line.starts_with("min-system-llvm-version") {

                     let min_version = line

                         .trim_end()

@@ -208,7 +209,7 @@ impl EarlyProps {

                         .expect("Malformed llvm version directive");

                     // Ignore if using system LLVM and actual version

                     // is smaller the minimum required version

-                    config.system_llvm && &actual_version[..] < min_version

+                    config.system_llvm && actual_version < version_to_int(min_version)

                 } else if line.starts_with("ignore-llvm-version") {

                     // Syntax is: "ignore-llvm-version <version1> [- <version2>]"

                     let range_components = line

@@ -219,15 +220,15 @@ impl EarlyProps {

                         .take(3) // 3 or more = invalid, so take at most 3.

                         .collect::<Vec<&str>>();

                     match range_components.len() {

-                        1 => &actual_version[..] == range_components[0],

+                        1 => actual_version == version_to_int(range_components[0]),

                         2 => {

-                            let v_min = range_components[0];

-                            let v_max = range_components[1];

+                            let v_min = version_to_int(range_components[0]);

+                            let v_max = version_to_int(range_components[1]);

                             if v_max < v_min {

                                 panic!("Malformed LLVM version range: max < min")

                             }

                             // Ignore if version lies inside of range.

-                            &actual_version[..] >= v_min && &actual_version[..] <= v_max

+                            actual_version >= v_min && actual_version <= v_max

                         }

                         _ => panic!("Malformed LLVM version directive"),

                     }

@@ -238,6 +239,20 @@ impl EarlyProps {

                 false

             }

         }

+

+        fn version_to_int(version: &str) -> u32 {

+            let version_without_suffix = version.split('-').next().unwrap();

+            let components: Vec<u32> = version_without_suffix

+                .split('.')

+                .map(|s| s.parse().expect("Malformed version component"))

+                .collect();

+            match components.len() {

+                1 => components[0] * 10000,

+                2 => components[0] * 10000 + components[1] * 100,

+                3 => components[0] * 10000 + components[1] * 100 + components[2],

+                _ => panic!("Malformed version"),

+            }

+        }

     }

 }

diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs

index 6c478f7e29da..31d991e0c2f8 100644

--- a/src/tools/compiletest/src/header/tests.rs

+++ b/src/tools/compiletest/src/header/tests.rs

@@ -122,9 +122,8 @@ fn llvm_version() {

     config.llvm_version = Some("9.3.1-rust-1.43.0-dev".to_owned());

     assert!(!parse_rs(&config, "// min-llvm-version 9.2").ignore);

-    // FIXME.

-    // config.llvm_version = Some("10.0.0-rust".to_owned());

-    // assert!(!parse_rs(&config, "// min-llvm-version 9.0").ignore);

+    config.llvm_version = Some("10.0.0-rust".to_owned());

+    assert!(!parse_rs(&config, "// min-llvm-version 9.0").ignore);

 }

 #[test]