diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73d4188d69549..c5dd3cd720548 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -136,6 +136,8 @@ file. If you still have a `config.mk` file in your directory - from ### Building [building]: #building +A default configuration shall use around 3.5 GB of disk space, whereas building a debug configuration may require more than 30 GB. + Dependencies - [build dependencies](README.md#building-from-source) - `gdb` 6.2.0 minimum, 7.1 or later recommended for test builds diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 2c2cf74d9790f..d952cb5bfc4bc 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -149,6 +149,7 @@ impl Step for Llvm { .define("WITH_POLLY", "OFF") .define("LLVM_ENABLE_TERMINFO", "OFF") .define("LLVM_ENABLE_LIBEDIT", "OFF") + .define("LLVM_ENABLE_LIBXML2", "OFF") .define("LLVM_PARALLEL_COMPILE_JOBS", builder.jobs().to_string()) .define("LLVM_TARGET_ARCH", target.split('-').next().unwrap()) .define("LLVM_DEFAULT_TARGET_TRIPLE", target); diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index 212de375a3f91..b65e9a715faca 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -930,7 +930,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> { } else if let hir::ImplItemKind::Method(ref sig, _) = ast_item.node { let generics = self.tcx.generics_of(def_id); let types = generics.parent_types as usize + generics.types.len(); - let needs_inline = types > 0 || tcx.trans_fn_attrs(def_id).requests_inline() && + let needs_inline = (types > 0 || tcx.trans_fn_attrs(def_id).requests_inline()) && !self.metadata_output_only(); let is_const_fn = sig.constness == hir::Constness::Const; let always_encode_mir = self.tcx.sess.opts.debugging_opts.always_encode_mir; diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs index aeefd5ab1d5ac..591732fbba911 100644 --- a/src/librustc_mir/transform/qualify_consts.rs +++ b/src/librustc_mir/transform/qualify_consts.rs @@ -964,7 +964,7 @@ This does not pose a problem by itself because they can't be accessed directly." let (msg, note) = if let UnstableFeatures::Disallow = self.tcx.sess.opts.unstable_features { (format!("calls in {}s are limited to \ - struct and enum constructors", + tuple structs and tuple variants", self.mode), Some("a limited form of compile-time function \ evaluation is available on a nightly \ @@ -972,7 +972,7 @@ This does not pose a problem by itself because they can't be accessed directly." } else { (format!("calls in {}s are limited \ to constant functions, \ - struct and enum constructors", + tuple structs and tuple variants", self.mode), None) }; diff --git a/src/librustc_trans/back/linker.rs b/src/librustc_trans/back/linker.rs index ebcf06d63be26..e001e809ee5f0 100644 --- a/src/librustc_trans/back/linker.rs +++ b/src/librustc_trans/back/linker.rs @@ -960,6 +960,7 @@ impl Linker for WasmLd { fn finalize(&mut self) -> Command { self.cmd.arg("--threads"); + self.cmd.arg("-z").arg("stack-size=1048576"); // FIXME we probably shouldn't pass this but instead pass an explicit // whitelist of symbols we'll allow to be undefined. Unfortunately diff --git a/src/stdsimd b/src/stdsimd index effdcd0132d17..1ea18a5cb431e 160000 --- a/src/stdsimd +++ b/src/stdsimd @@ -1 +1 @@ -Subproject commit effdcd0132d17b6c4badc67b4b6d3fdf749a2d22 +Subproject commit 1ea18a5cb431e24aa838b652ac305acc5e394d6b diff --git a/src/test/compile-fail/issue-43105.rs b/src/test/compile-fail/issue-43105.rs index c0af3b4b9e695..6fa65a541b39b 100644 --- a/src/test/compile-fail/issue-43105.rs +++ b/src/test/compile-fail/issue-43105.rs @@ -11,7 +11,7 @@ fn xyz() -> u8 { 42 } const NUM: u8 = xyz(); -//~^ ERROR calls in constants are limited to constant functions, struct and enum constructors +//~^ ERROR calls in constants are limited to constant functions, tuple structs and tuple variants //~| ERROR constant evaluation error fn main() { diff --git a/src/test/compile-fail/issue32829.rs b/src/test/compile-fail/issue32829.rs index e0b847fc99470..9a84322ad063b 100644 --- a/src/test/compile-fail/issue32829.rs +++ b/src/test/compile-fail/issue32829.rs @@ -7,6 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// ignore-tidy-linelength + #![feature(const_fn)] const bad : u32 = { @@ -20,7 +23,7 @@ const bad_two : u32 = { { invalid(); //~^ ERROR: blocks in constants are limited to items and tail expressions - //~^^ ERROR: calls in constants are limited to constant functions, struct and enum + //~^^ ERROR: calls in constants are limited to constant functions, tuple structs and tuple variants 0 } }; @@ -44,7 +47,7 @@ static bad_five : u32 = { { invalid(); //~^ ERROR: blocks in statics are limited to items and tail expressions - //~^^ ERROR: calls in statics are limited to constant functions, struct and enum + //~^^ ERROR: calls in statics are limited to constant functions, tuple structs and tuple variants 0 } }; @@ -68,7 +71,7 @@ static mut bad_eight : u32 = { { invalid(); //~^ ERROR: blocks in statics are limited to items and tail expressions - //~^^ ERROR: calls in statics are limited to constant functions, struct and enum + //~^^ ERROR: calls in statics are limited to constant functions, tuple structs and tuple variants 0 } }; diff --git a/src/test/ui/const-fn-error.stderr b/src/test/ui/const-fn-error.stderr index 077c4d60e649c..767f28ff7b190 100644 --- a/src/test/ui/const-fn-error.stderr +++ b/src/test/ui/const-fn-error.stderr @@ -4,7 +4,7 @@ error[E0016]: blocks in constant functions are limited to items and tail express LL | let mut sum = 0; | ^ -error[E0015]: calls in constant functions are limited to constant functions, struct and enum constructors +error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants --> $DIR/const-fn-error.rs:18:14 | LL | for i in 0..x { diff --git a/src/test/ui/mir_check_nonconst.rs b/src/test/ui/mir_check_nonconst.rs new file mode 100644 index 0000000000000..898ee8bbd44ed --- /dev/null +++ b/src/test/ui/mir_check_nonconst.rs @@ -0,0 +1,21 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![allow(dead_code)] + +struct Foo { a: u8 } +fn bar() -> Foo { + Foo { a: 5 } +} + +static foo: Foo = bar(); +//~^ ERROR calls in statics are limited to constant functions, tuple structs and tuple variants + +fn main() {} diff --git a/src/test/ui/mir_check_nonconst.stderr b/src/test/ui/mir_check_nonconst.stderr new file mode 100644 index 0000000000000..1fddaf30576c5 --- /dev/null +++ b/src/test/ui/mir_check_nonconst.stderr @@ -0,0 +1,9 @@ +error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants + --> $DIR/mir_check_nonconst.rs:18:19 + | +LL | static foo: Foo = bar(); + | ^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0015`. diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index c16dbd0272a76..0f4d247633a61 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2880,8 +2880,10 @@ impl<'test> TestCx<'test> { } } - let expected_output_path = self.expected_output_path(kind); - let output_file = self.output_base_name().with_file_name(&expected_output_path); + let expected_output = self.expected_output_path(kind); + // #50113: output is abspath; only want filename component. + let expected_output = expected_output.file_name().expect("output path requires file name"); + let output_file = self.output_base_name().with_file_name(&expected_output); match File::create(&output_file).and_then(|mut f| f.write_all(actual.as_bytes())) { Ok(()) => {} Err(e) => self.fatal(&format!(