about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm
diff options
context:
space:
mode:
authorRichard Cobbe <ricobbe@microsoft.com>2021-07-12 12:46:27 -0700
committerRichard Cobbe <ricobbe@microsoft.com>2021-07-16 11:10:31 -0700
commitce59f1aac53ba209d0a97af720f596f943fcfbaa (patch)
tree1057d44c311966db4373bd17d19afdd2b49a138e /compiler/rustc_codegen_llvm
parentb5a2ccee81406303324016d03399fac68ceb6718 (diff)
downloadrust-ce59f1aac53ba209d0a97af720f596f943fcfbaa.tar.gz
rust-ce59f1aac53ba209d0a97af720f596f943fcfbaa.zip
Consider all fields when comparing DllImports, to remove nondetermininsm in multiple-definitions test
Diffstat (limited to 'compiler/rustc_codegen_llvm')
-rw-r--r--compiler/rustc_codegen_llvm/src/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs
index 26fd1cfbcd0..aa4db1622b2 100644
--- a/compiler/rustc_codegen_llvm/src/lib.rs
+++ b/compiler/rustc_codegen_llvm/src/lib.rs
@@ -292,9 +292,7 @@ impl CodegenBackend for LlvmCodegenBackend {
 
         // Run the linker on any artifacts that resulted from the LLVM run.
         // This should produce either a finished executable or library.
-        link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs);
-
-        Ok(())
+        link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs)
     }
 }