diff options
| author | bors <bors@rust-lang.org> | 2019-01-24 21:23:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-24 21:23:11 +0000 |
| commit | 278067d34d1535a840cf9c99bcb8b538bf5b109a (patch) | |
| tree | 7d3bd558b1a01bef4485dba03117107a7e132635 /src/librustc_codegen_ssa | |
| parent | 01f8e25b15f4ab157c8e7c9c56054df7595ec0e1 (diff) | |
| parent | 5fa1016f93d77e43c3ed69b1155308616095cfcb (diff) | |
| download | rust-278067d34d1535a840cf9c99bcb8b538bf5b109a.tar.gz rust-278067d34d1535a840cf9c99bcb8b538bf5b109a.zip | |
Auto merge of #57879 - Centril:rollup, r=Centril
Rollup of 9 pull requests Successful merges: - #57380 (Fix Instant/Duration math precision & associativity on Windows) - #57606 (Get rid of the fake stack frame for reading from constants) - #57803 (Several changes to libunwind for SGX target) - #57846 (rustdoc: fix ICE from loading proc-macro stubs) - #57860 (Add os::fortanix_sgx::ffi module) - #57861 (Don't export table by default in wasm) - #57863 (Add suggestion for incorrect field syntax.) - #57867 (Fix std::future::from_generator documentation) - #57873 (Stabilize no_panic_pow) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/linker.rs | 3 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/mir/constant.rs | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs index 06d4f940436..ad61f8f01d8 100644 --- a/src/librustc_codegen_ssa/back/linker.rs +++ b/src/librustc_codegen_ssa/back/linker.rs @@ -911,9 +911,6 @@ impl<'a> WasmLd<'a> { // For now we just never have an entry symbol cmd.arg("--no-entry"); - // Make the default table accessible - cmd.arg("--export-table"); - // Rust code should never have warnings, and warnings are often // indicative of bugs, let's prevent them. cmd.arg("--fatal-warnings"); diff --git a/src/librustc_codegen_ssa/mir/constant.rs b/src/librustc_codegen_ssa/mir/constant.rs index e6d6ef1d7a3..56d4342e6e1 100644 --- a/src/librustc_codegen_ssa/mir/constant.rs +++ b/src/librustc_codegen_ssa/mir/constant.rs @@ -59,7 +59,6 @@ impl<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { let field = const_field( bx.tcx(), ty::ParamEnv::reveal_all(), - self.instance, None, mir::Field::new(field as usize), c, |