about summary refs log tree commit diff
path: root/compiler/rustc_codegen_cranelift
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-07-18 14:21:56 +0900
committerGitHub <noreply@github.com>2021-07-18 14:21:56 +0900
commit81d0b7040233bc306e66d83654b7e969f8057aac (patch)
treee62c77e49a4a2d5fde148a7d2197cee10eb3de37 /compiler/rustc_codegen_cranelift
parenteef510865acf2bd77cdd10f43226e320eefa0509 (diff)
parentce59f1aac53ba209d0a97af720f596f943fcfbaa (diff)
downloadrust-81d0b7040233bc306e66d83654b7e969f8057aac.tar.gz
rust-81d0b7040233bc306e66d83654b7e969f8057aac.zip
Rollup merge of #87092 - ricobbe:fix-raw-dylib-multiple-definitions, r=petrochenkov
Remove nondeterminism in multiple-definitions test

Compare all fields in `DllImport` when sorting to avoid nondeterminism in the error for multiple inconsistent definitions of an extern function.  Restore the multiple-definitions test.

Resolves #87084.
Diffstat (limited to 'compiler/rustc_codegen_cranelift')
-rw-r--r--compiler/rustc_codegen_cranelift/src/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs
index cb1cb3c74db..e32dae49131 100644
--- a/compiler/rustc_codegen_cranelift/src/lib.rs
+++ b/compiler/rustc_codegen_cranelift/src/lib.rs
@@ -221,9 +221,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
             sess,
             &codegen_results,
             outputs,
-        );
-
-        Ok(())
+        )
     }
 }