Skip to content

Commit 28742a1

Browse files
borsbors
committed
Auto merge of rust-lang#71147 - cuviper:min-llvm8, r=Mark-Simulacrum
Update the minimum external LLVM to 8 LLVM 8 was released on March 20, 2019, over a year ago.
2 parents cff9a75 + 8506bb0 commit 28742a1

30 files changed

+67
-195
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
matrix:
3737
name:
3838
- mingw-check
39-
- x86_64-gnu-llvm-7
39+
- x86_64-gnu-llvm-8
4040
- x86_64-gnu-tools
4141
include:
4242
- name: mingw-check
4343
os: ubuntu-latest-xl
4444
env: {}
45-
- name: x86_64-gnu-llvm-7
45+
- name: x86_64-gnu-llvm-8
4646
os: ubuntu-latest-xl
4747
env: {}
4848
- name: x86_64-gnu-tools
@@ -352,7 +352,7 @@ jobs:
352352
- x86_64-gnu-debug
353353
- x86_64-gnu-distcheck
354354
- x86_64-gnu-full-bootstrap
355-
- x86_64-gnu-llvm-7
355+
- x86_64-gnu-llvm-8
356356
- x86_64-gnu-nopt
357357
- x86_64-gnu-tools
358358
- x86_64-mingw-1
@@ -469,7 +469,7 @@ jobs:
469469
- name: x86_64-gnu-full-bootstrap
470470
os: ubuntu-latest-xl
471471
env: {}
472-
- name: x86_64-gnu-llvm-7
472+
- name: x86_64-gnu-llvm-8
473473
env:
474474
RUST_BACKTRACE: 1
475475
os: ubuntu-latest-xl

‎src/bootstrap/native.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,11 @@ fn check_llvm_version(builder: &Builder<'_>, llvm_config: &Path) {
289289
let version = output(cmd.arg("--version"));
290290
let mut parts = version.split('.').take(2).filter_map(|s| s.parse::<u32>().ok());
291291
if let (Some(major), Some(_minor)) = (parts.next(), parts.next()) {
292-
if major >= 7 {
292+
if major >= 8 {
293293
return;
294294
}
295295
}
296-
panic!("\n\nbad LLVM version: {}, need >=7.0\n\n", version)
296+
panic!("\n\nbad LLVM version: {}, need >=8.0\n\n", version)
297297
}
298298

299299
fn configure_cmake(

‎src/ci/azure-pipelines/auto.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- template: steps/run.yml
3030
strategy:
3131
matrix:
32-
x86_64-gnu-llvm-7:
32+
x86_64-gnu-llvm-8:
3333
RUST_BACKTRACE: 1
3434
dist-x86_64-linux: {}
3535
dist-x86_64-linux-alt:

‎src/ci/azure-pipelines/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- template: steps/run.yml
3030
strategy:
3131
matrix:
32-
x86_64-gnu-llvm-7: {}
32+
x86_64-gnu-llvm-8: {}
3333
mingw-check: {}
3434
x86_64-gnu-tools:
3535
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1

‎src/ci/docker/x86_64-gnu-llvm-7/Dockerfile renamed to ‎src/ci/docker/x86_64-gnu-llvm-8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1212
cmake \
1313
sudo \
1414
gdb \
15-
llvm-7-tools \
15+
llvm-8-tools \
1616
libedit-dev \
1717
libssl-dev \
1818
pkg-config \
@@ -26,7 +26,7 @@ RUN sh /scripts/sccache.sh
2626
# using llvm-link-shared due to libffi issues -- see #34486
2727
ENV RUST_CONFIGURE_ARGS \
2828
--build=x86_64-unknown-linux-gnu \
29-
--llvm-root=/usr/lib/llvm-7 \
29+
--llvm-root=/usr/lib/llvm-8 \
3030
--enable-llvm-link-shared \
3131
--set rust.thin-lto-import-instr-limit=10
3232

‎src/ci/github-actions/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ jobs:
259259
matrix:
260260
name:
261261
- mingw-check
262-
- x86_64-gnu-llvm-7
262+
- x86_64-gnu-llvm-8
263263
- x86_64-gnu-tools
264264
include:
265265
- name: mingw-check
266266
<<: *job-linux-xl
267267

268-
- name: x86_64-gnu-llvm-7
268+
- name: x86_64-gnu-llvm-8
269269
<<: *job-linux-xl
270270

271271
- name: x86_64-gnu-tools
@@ -349,7 +349,7 @@ jobs:
349349
- x86_64-gnu-debug
350350
- x86_64-gnu-distcheck
351351
- x86_64-gnu-full-bootstrap
352-
- x86_64-gnu-llvm-7
352+
- x86_64-gnu-llvm-8
353353
- x86_64-gnu-nopt
354354
- x86_64-gnu-tools
355355
- x86_64-mingw-1
@@ -471,7 +471,7 @@ jobs:
471471
- name: x86_64-gnu-full-bootstrap
472472
<<: *job-linux-xl
473473

474-
- name: x86_64-gnu-llvm-7
474+
- name: x86_64-gnu-llvm-8
475475
env:
476476
RUST_BACKTRACE: 1
477477
<<: *job-linux-xl

‎src/librustc_codegen_llvm/attributes.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,12 @@ fn naked(val: &'ll Value, is_naked: bool) {
8282

8383
pub fn set_frame_pointer_elimination(cx: &CodegenCx<'ll, '_>, llfn: &'ll Value) {
8484
if cx.sess().must_not_eliminate_frame_pointers() {
85-
if llvm_util::get_major_version() >= 8 {
86-
llvm::AddFunctionAttrStringValue(
87-
llfn,
88-
llvm::AttributePlace::Function,
89-
const_cstr!("frame-pointer"),
90-
const_cstr!("all"),
91-
);
92-
} else {
93-
llvm::AddFunctionAttrStringValue(
94-
llfn,
95-
llvm::AttributePlace::Function,
96-
const_cstr!("no-frame-pointer-elim"),
97-
const_cstr!("true"),
98-
);
99-
}
85+
llvm::AddFunctionAttrStringValue(
86+
llfn,
87+
llvm::AttributePlace::Function,
88+
const_cstr!("frame-pointer"),
89+
const_cstr!("all"),
90+
);
10091
}
10192
}
10293

‎src/librustc_codegen_llvm/debuginfo/metadata.rs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use crate::llvm::debuginfo::{
1616
DIArray, DICompositeType, DIDescriptor, DIFile, DIFlags, DILexicalBlock, DIScope, DIType,
1717
DebugEmissionKind,
1818
};
19-
use crate::llvm_util;
2019
use crate::value::Value;
2120

2221
use log::debug;
@@ -1289,22 +1288,11 @@ fn prepare_union_metadata(
12891288
// Enums
12901289
//=-----------------------------------------------------------------------------
12911290

1292-
/// DWARF variant support is only available starting in LLVM 8.
1293-
/// Although the earlier enum debug info output did not work properly
1294-
/// in all situations, it is better for the time being to continue to
1295-
/// sometimes emit the old style rather than emit something completely
1296-
/// useless when rust is compiled against LLVM 6 or older. LLVM 7
1297-
/// contains an early version of the DWARF variant support, and will
1298-
/// crash when handling the new debug info format. This function
1299-
/// decides which representation will be emitted.
1291+
/// DWARF variant support is only available starting in LLVM 8, but
1292+
/// on MSVC we have to use the fallback mode, because LLVM doesn't
1293+
/// lower variant parts to PDB.
13001294
fn use_enum_fallback(cx: &CodegenCx<'_, '_>) -> bool {
1301-
// On MSVC we have to use the fallback mode, because LLVM doesn't
1302-
// lower variant parts to PDB.
13031295
cx.sess().target.target.options.is_like_msvc
1304-
// LLVM version 7 did not release with an important bug fix;
1305-
// but the required patch is in the LLVM 8. Rust LLVM reports
1306-
// 8 as well.
1307-
|| llvm_util::get_major_version() < 8
13081296
}
13091297

13101298
// FIXME(eddyb) maybe precompute this? Right now it's computed once

‎src/librustc_codegen_llvm/intrinsic.rs

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use crate::abi::{Abi, FnAbi, LlvmType, PassMode};
22
use crate::builder::Builder;
33
use crate::context::CodegenCx;
44
use crate::llvm;
5-
use crate::llvm_util;
65
use crate::type_::Type;
76
use crate::type_of::LayoutLlvmExt;
87
use crate::va_arg::emit_va_arg;
@@ -11,7 +10,7 @@ use crate::value::Value;
1110
use rustc_ast::ast;
1211
use rustc_codegen_ssa::base::{compare_simd_types, to_immediate, wants_msvc_seh};
1312
use rustc_codegen_ssa::common::span_invalid_monomorphization_error;
14-
use rustc_codegen_ssa::common::{IntPredicate, TypeKind};
13+
use rustc_codegen_ssa::common::TypeKind;
1514
use rustc_codegen_ssa::glue;
1615
use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
1716
use rustc_codegen_ssa::mir::place::PlaceRef;
@@ -461,46 +460,14 @@ impl IntrinsicCallMethods<'tcx> for Builder<'a, 'll, 'tcx> {
461460
let is_add = name == "saturating_add";
462461
let lhs = args[0].immediate();
463462
let rhs = args[1].immediate();
464-
if llvm_util::get_major_version() >= 8 {
465-
let llvm_name = &format!(
466-
"llvm.{}{}.sat.i{}",
467-
if signed { 's' } else { 'u' },
468-
if is_add { "add" } else { "sub" },
469-
width
470-
);
471-
let llfn = self.get_intrinsic(llvm_name);
472-
self.call(llfn, &[lhs, rhs], None)
473-
} else {
474-
let llvm_name = &format!(
475-
"llvm.{}{}.with.overflow.i{}",
476-
if signed { 's' } else { 'u' },
477-
if is_add { "add" } else { "sub" },
478-
width
479-
);
480-
let llfn = self.get_intrinsic(llvm_name);
481-
let pair = self.call(llfn, &[lhs, rhs], None);
482-
let val = self.extract_value(pair, 0);
483-
let overflow = self.extract_value(pair, 1);
484-
let llty = self.type_ix(width);
485-
486-
let limit = if signed {
487-
let limit_lo = self
488-
.const_uint_big(llty, (i128::MIN >> (128 - width)) as u128);
489-
let limit_hi = self
490-
.const_uint_big(llty, (i128::MAX >> (128 - width)) as u128);
491-
let neg = self.icmp(
492-
IntPredicate::IntSLT,
493-
val,
494-
self.const_uint(llty, 0),
495-
);
496-
self.select(neg, limit_hi, limit_lo)
497-
} else if is_add {
498-
self.const_uint_big(llty, u128::MAX >> (128 - width))
499-
} else {
500-
self.const_uint(llty, 0)
501-
};
502-
self.select(overflow, limit, val)
503-
}
463+
let llvm_name = &format!(
464+
"llvm.{}{}.sat.i{}",
465+
if signed { 's' } else { 'u' },
466+
if is_add { "add" } else { "sub" },
467+
width
468+
);
469+
let llfn = self.get_intrinsic(llvm_name);
470+
self.call(llfn, &[lhs, rhs], None)
504471
}
505472
_ => bug!(),
506473
},

‎src/librustc_codegen_llvm/llvm_util.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,15 @@ unsafe fn configure_llvm(sess: &Session) {
8383
if !sess.opts.debugging_opts.no_generate_arange_section {
8484
add("-generate-arange-section", false);
8585
}
86-
if get_major_version() >= 8 {
87-
match sess
88-
.opts
89-
.debugging_opts
90-
.merge_functions
91-
.unwrap_or(sess.target.target.options.merge_functions)
92-
{
93-
MergeFunctions::Disabled | MergeFunctions::Trampolines => {}
94-
MergeFunctions::Aliases => {
95-
add("-mergefunc-use-aliases", false);
96-
}
86+
match sess
87+
.opts
88+
.debugging_opts
89+
.merge_functions
90+
.unwrap_or(sess.target.target.options.merge_functions)
91+
{
92+
MergeFunctions::Disabled | MergeFunctions::Trampolines => {}
93+
MergeFunctions::Aliases => {
94+
add("-mergefunc-use-aliases", false);
9795
}
9896
}
9997

0 commit comments

Comments
 (0)