Skip to content

Commit 5b52591

Browse files
borsbors
committed
Auto merge of #51899 - gnzlbg:llvm501, r=alexcrichton
bump minimum LLVM version to 5.0 Closes #51878 . r? @alexcrichton -- cc @cuviper @infinity0
2 parents 9bd8458 + 3b36ce6 commit 5b52591

30 files changed

+17
-101
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ matrix:
1212
fast_finish: true
1313
include:
1414
# Images used in testing PR and try-build should be run first.
15-
- env: IMAGE=x86_64-gnu-llvm-3.9 RUST_BACKTRACE=1
15+
- env: IMAGE=x86_64-gnu-llvm-5.0 RUST_BACKTRACE=1
1616
if: type = pull_request OR branch = auto
1717

1818
- env: IMAGE=dist-x86_64-linux DEPLOY=1

‎src/bootstrap/native.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,12 @@ fn check_llvm_version(builder: &Builder, llvm_config: &Path) {
256256
let version = output(cmd.arg("--version"));
257257
let mut parts = version.split('.').take(2)
258258
.filter_map(|s| s.parse::<u32>().ok());
259-
if let (Some(major), Some(minor)) = (parts.next(), parts.next()) {
260-
if major > 3 || (major == 3 && minor >= 9) {
259+
if let (Some(major), Some(_minor)) = (parts.next(), parts.next()) {
260+
if major >= 5 {
261261
return
262262
}
263263
}
264-
panic!("\n\nbad LLVM version: {}, need >=3.9\n\n", version)
264+
panic!("\n\nbad LLVM version: {}, need >=5.0\n\n", version)
265265
}
266266

267267
fn configure_cmake(builder: &Builder,

‎src/ci/docker/x86_64-gnu-llvm-3.9/Dockerfile ‎src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14-
llvm-3.9-tools \
14+
llvm-5.0-tools \
1515
libedit-dev \
1616
zlib1g-dev \
1717
xz-utils
@@ -22,6 +22,6 @@ RUN sh /scripts/sccache.sh
2222
# using llvm-link-shared due to libffi issues -- see #34486
2323
ENV RUST_CONFIGURE_ARGS \
2424
--build=x86_64-unknown-linux-gnu \
25-
--llvm-root=/usr/lib/llvm-3.9 \
25+
--llvm-root=/usr/lib/llvm-5.0 \
2626
--enable-llvm-link-shared
2727
ENV RUST_CHECK_TARGET check

‎src/librustc_codegen_llvm/abi.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,7 @@ impl<'a, 'tcx> FnTypeExt<'a, 'tcx> for FnType<'tcx, Ty<'tcx>> {
666666
layout::Int(..) if !scalar.is_bool() => {
667667
let range = scalar.valid_range_exclusive(bx.cx);
668668
if range.start != range.end {
669-
// FIXME(nox): This causes very weird type errors about
670-
// SHL operators in constants in stage 2 with LLVM 3.9.
671-
if unsafe { llvm::LLVMRustVersionMajor() >= 4 } {
672-
bx.range_metadata(callsite, range);
673-
}
669+
bx.range_metadata(callsite, range);
674670
}
675671
}
676672
_ => {}

‎src/librustc_codegen_llvm/mir/mod.rs

+4-18
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use builder::Builder;
2222
use common::{CodegenCx, Funclet};
2323
use debuginfo::{self, declare_local, VariableAccess, VariableKind, FunctionDebugContext};
2424
use monomorphize::Instance;
25-
use abi::{ArgAttribute, ArgTypeExt, FnType, FnTypeExt, PassMode};
25+
use abi::{ArgTypeExt, FnType, FnTypeExt, PassMode};
2626
use type_::Type;
2727

2828
use syntax_pos::{DUMMY_SP, NO_EXPANSION, BytePos, Span};
@@ -430,10 +430,6 @@ fn arg_local_refs<'a, 'tcx>(bx: &Builder<'a, 'tcx>,
430430
None
431431
};
432432

433-
let deref_op = unsafe {
434-
[llvm::LLVMRustDIBuilderCreateOpDeref()]
435-
};
436-
437433
mir.args_iter().enumerate().map(|(arg_index, local)| {
438434
let arg_decl = &mir.local_decls[local];
439435

@@ -543,21 +539,11 @@ fn arg_local_refs<'a, 'tcx>(bx: &Builder<'a, 'tcx>,
543539
if arg_index > 0 || mir.upvar_decls.is_empty() {
544540
// The Rust ABI passes indirect variables using a pointer and a manual copy, so we
545541
// need to insert a deref here, but the C ABI uses a pointer and a copy using the
546-
// byval attribute, for which LLVM does the deref itself, so we must not add it.
547-
// Starting with D31439 in LLVM 5, it *always* does the deref itself.
548-
let mut variable_access = VariableAccess::DirectVariable {
542+
// byval attribute, for which LLVM always does the deref itself,
543+
// so we must not add it.
544+
let variable_access = VariableAccess::DirectVariable {
549545
alloca: place.llval
550546
};
551-
if unsafe { llvm::LLVMRustVersionMajor() < 5 } {
552-
if let PassMode::Indirect(ref attrs) = arg.mode {
553-
if !attrs.contains(ArgAttribute::ByVal) {
554-
variable_access = VariableAccess::IndirectVariable {
555-
alloca: place.llval,
556-
address_operations: &deref_op,
557-
};
558-
}
559-
}
560-
}
561547

562548
declare_local(
563549
bx,

‎src/rustllvm/RustWrapper.cpp

+2-31
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,8 @@ inline LLVMRustDIFlags visibility(LLVMRustDIFlags F) {
492492
return static_cast<LLVMRustDIFlags>(static_cast<uint32_t>(F) & 0x3);
493493
}
494494

495-
#if LLVM_VERSION_GE(4, 0)
496495
static DINode::DIFlags fromRust(LLVMRustDIFlags Flags) {
497496
DINode::DIFlags Result = DINode::DIFlags::FlagZero;
498-
#else
499-
static unsigned fromRust(LLVMRustDIFlags Flags) {
500-
unsigned Result = 0;
501-
#endif
502497

503498
switch (visibility(Flags)) {
504499
case LLVMRustDIFlags::FlagPrivate:
@@ -565,14 +560,12 @@ static unsigned fromRust(LLVMRustDIFlags Flags) {
565560
if (isSet(Flags & LLVMRustDIFlags::FlagBitField)) {
566561
Result |= DINode::DIFlags::FlagBitField;
567562
}
568-
#if LLVM_RUSTLLVM || LLVM_VERSION_GE(4, 0)
569563
if (isSet(Flags & LLVMRustDIFlags::FlagNoReturn)) {
570564
Result |= DINode::DIFlags::FlagNoReturn;
571565
}
572566
if (isSet(Flags & LLVMRustDIFlags::FlagMainSubprogram)) {
573567
Result |= DINode::DIFlags::FlagMainSubprogram;
574568
}
575-
#endif
576569

577570
return Result;
578571
}
@@ -612,14 +605,8 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateCompileUnit(
612605
unsigned RuntimeVer, const char *SplitName) {
613606
auto *File = unwrapDI<DIFile>(FileRef);
614607

615-
#if LLVM_VERSION_GE(4, 0)
616608
return wrap(Builder->createCompileUnit(Lang, File, Producer, isOptimized,
617609
Flags, RuntimeVer, SplitName));
618-
#else
619-
return wrap(Builder->createCompileUnit(Lang, File->getFilename(),
620-
File->getDirectory(), Producer, isOptimized,
621-
Flags, RuntimeVer, SplitName));
622-
#endif
623610
}
624611

625612
extern "C" LLVMMetadataRef
@@ -657,11 +644,7 @@ extern "C" LLVMMetadataRef
657644
LLVMRustDIBuilderCreateBasicType(LLVMRustDIBuilderRef Builder, const char *Name,
658645
uint64_t SizeInBits, uint32_t AlignInBits,
659646
unsigned Encoding) {
660-
return wrap(Builder->createBasicType(Name, SizeInBits,
661-
#if LLVM_VERSION_LE(3, 9)
662-
AlignInBits,
663-
#endif
664-
Encoding));
647+
return wrap(Builder->createBasicType(Name, SizeInBits, Encoding));
665648
}
666649

667650
extern "C" LLVMMetadataRef LLVMRustDIBuilderCreatePointerType(
@@ -722,7 +705,6 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
722705
LLVMMetadataRef Decl = nullptr, uint32_t AlignInBits = 0) {
723706
llvm::GlobalVariable *InitVal = cast<llvm::GlobalVariable>(unwrap(V));
724707

725-
#if LLVM_VERSION_GE(4, 0)
726708
llvm::DIExpression *InitExpr = nullptr;
727709
if (llvm::ConstantInt *IntVal = llvm::dyn_cast<llvm::ConstantInt>(InitVal)) {
728710
InitExpr = Builder->createConstantValueExpression(
@@ -741,12 +723,6 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
741723
InitVal->setMetadata("dbg", VarExpr);
742724

743725
return wrap(VarExpr);
744-
#else
745-
return wrap(Builder->createGlobalVariable(
746-
unwrapDI<DIDescriptor>(Context), Name, LinkageName,
747-
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit,
748-
InitVal, unwrapDIPtr<MDNode>(Decl)));
749-
#endif
750726
}
751727

752728
extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariable(
@@ -757,12 +733,7 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariable(
757733
if (Tag == 0x100) { // DW_TAG_auto_variable
758734
return wrap(Builder->createAutoVariable(
759735
unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNo,
760-
unwrapDI<DIType>(Ty), AlwaysPreserve, fromRust(Flags)
761-
#if LLVM_VERSION_GE(4, 0)
762-
,
763-
AlignInBits
764-
#endif
765-
));
736+
unwrapDI<DIType>(Ty), AlwaysPreserve, fromRust(Flags), AlignInBits));
766737
} else {
767738
return wrap(Builder->createParameterVariable(
768739
unwrapDI<DIDescriptor>(Scope), Name, ArgNo, unwrapDI<DIFile>(File),

‎src/test/codegen/call-metadata.rs

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// scalar value.
1313

1414
// compile-flags: -C no-prepopulate-passes
15-
// min-llvm-version 4.0
16-
1715

1816
#![crate_type = "lib"]
1917

‎src/test/codegen/issue-37945.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// min-llvm-version 4.0
1211
// compile-flags: -O
1312
// ignore-x86
1413
// ignore-arm

‎src/test/codegen/issue-45466.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// min-llvm-version 4.0
1211
// compile-flags: -O
12+
// min-llvm-version 6.0
1313

1414
#![crate_type="rlib"]
1515

‎src/test/codegen/mainsubprogram.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// ignore-tidy-linelength
1515
// ignore-windows
1616
// ignore-macos
17-
// min-llvm-version 4.0
1817

1918
// compile-flags: -g -C no-prepopulate-passes
2019

‎src/test/codegen/mainsubprogramstart.rs

-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// This test depends on a patch that was committed to upstream LLVM
12-
// before 4.0, formerly backported to the Rust LLVM fork.
13-
1411
// ignore-tidy-linelength
1512
// ignore-windows
1613
// ignore-macos
17-
// min-llvm-version 4.0
1814

1915
// compile-flags: -g -C no-prepopulate-passes
2016

‎src/test/codegen/noreturnflag.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// compile-flags: -g -C no-prepopulate-passes
1212
// ignore-tidy-linelength
13-
// min-llvm-version 4.0
1413

1514
#![crate_type = "lib"]
1615

‎src/test/codegen/stack-probes.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// ignore-wasm
2222
// ignore-emscripten
2323
// ignore-windows
24-
// min-system-llvm-version 5.0
2524
// compile-flags: -C no-prepopulate-passes
2625

2726
#![crate_type = "lib"]

‎src/test/codegen/vtabletype.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// ignore-tidy-linelength
1515
// ignore-windows
1616
// ignore-macos
17-
// min-system-llvm-version 5.1
17+
// min-llvm-version 6.0
1818

1919
// compile-flags: -g -C no-prepopulate-passes
2020

‎src/test/compile-fail/simd-intrinsic-generic-reduction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// min-llvm-version 5.0
1211
// ignore-emscripten
1312

1413
// Test that the simd_reduce_{op} intrinsics produce ok-ish error

‎src/test/mir-opt/lower_128bit_test.rs

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// asmjs can't even pass i128 as arguments or return values, so ignore it.
12-
// this will hopefully be fixed by the LLVM 5 upgrade (#43370)
13-
// ignore-asmjs
1411
// ignore-emscripten
1512

1613
// compile-flags: -Z lower_128bit_ops=yes -C debug_assertions=no

‎src/test/run-make-fulldeps/cross-lang-lto/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
# min-llvm-version 4.0
31
# ignore-msvc
42

53
-include ../tools.mk

‎src/test/run-make-fulldeps/llvm-pass/llvm-function-pass.so.cc

+1-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@ namespace {
2828

2929
bool runOnFunction(Function &F) override;
3030

31-
#if LLVM_VERSION_MAJOR >= 4
32-
StringRef
33-
#else
34-
const char *
35-
#endif
36-
getPassName() const override {
31+
StringRef getPassName() const override {
3732
return "Some LLVM pass";
3833
}
3934

‎src/test/run-make-fulldeps/llvm-pass/llvm-module-pass.so.cc

+1-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@ namespace {
2727

2828
bool runOnModule(Module &M) override;
2929

30-
#if LLVM_VERSION_MAJOR >= 4
31-
StringRef
32-
#else
33-
const char *
34-
#endif
35-
getPassName() const override {
30+
StringRef getPassName() const override {
3631
return "Some LLVM pass";
3732
}
3833

‎src/test/run-pass/issue-40883.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// check that we don't have linear stack usage with multiple calls to `push`
12-
// min-llvm-version 4.0
1312

1413
#![feature(test)]
1514

‎src/test/run-pass/simd-intrinsic-generic-reduction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// min-llvm-version 5.0
1211
// ignore-emscripten
1312

1413
// Test that the simd_reduce_{op} intrinsics produce the correct results.

‎src/test/run-pass/stack-probes-lto.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// ignore-emscripten no processes
2222
// ignore-musl FIXME #31506
2323
// ignore-pretty
24-
// min-system-llvm-version 5.0
2524
// compile-flags: -C lto
2625
// no-prefer-dynamic
2726

‎src/test/run-pass/stack-probes.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
// ignore-cloudabi no processes
2121
// ignore-emscripten no processes
2222
// ignore-musl FIXME #31506
23-
// min-system-llvm-version 5.0
2423

2524
use std::mem;
2625
use std::process::Command;

‎src/test/run-pass/thin-lto-global-allocator.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// compile-flags: -Z thinlto -C codegen-units=2
12-
// min-llvm-version 4.0
1312

1413
#[global_allocator]
1514
static A: std::alloc::System = std::alloc::System;

‎src/test/run-pass/thinlto/all-crates.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// compile-flags: -Clto=thin
1212
// no-prefer-dynamic
13-
// min-llvm-version 4.0
1413

1514
fn main() {
1615
println!("hello!");

‎src/test/run-pass/thinlto/dylib-works.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// aux-build:dylib.rs
12-
// min-llvm-version 4.0
1312

1413
extern crate dylib;
1514

‎src/test/run-pass/thinlto/msvc-imp-present.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// aux-build:msvc-imp-present.rs
1212
// compile-flags: -Z thinlto -C codegen-units=8
13-
// min-llvm-version: 4.0
1413
// no-prefer-dynamic
1514

1615
// On MSVC we have a "hack" where we emit symbols that look like `_imp_$name`

‎src/test/run-pass/thinlto/thin-lto-inlines.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// compile-flags: -Z thinlto -C codegen-units=8 -O
12-
// min-llvm-version 4.0
1312
// ignore-emscripten can't inspect instructions on emscripten
1413

1514
// We want to assert here that ThinLTO will inline across codegen units. There's

‎src/test/run-pass/thinlto/thin-lto-inlines2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// compile-flags: -C codegen-units=8 -O -C lto=thin
1212
// aux-build:thin-lto-inlines-aux.rs
13-
// min-llvm-version 4.0
1413
// no-prefer-dynamic
1514
// ignore-emscripten can't inspect instructions on emscripten
1615

0 commit comments

Comments
 (0)