raw dylib checking should also call is_abi_supported

Author: RalfJung

compiler/rustc_metadata/src/errors.rs

@@ -301,14 +301,14 @@ pub struct NoLinkModOverride {
 
 #[derive(Diagnostic)]
 #[diag(metadata_unsupported_abi_i686)]
-pub struct UnsupportedAbiI686 {
+pub struct RawDylibUnsupportedAbiI686 {
     #[primary_span]
     pub span: Span,
 }
 
 #[derive(Diagnostic)]
 #[diag(metadata_unsupported_abi)]
-pub struct UnsupportedAbi {
+pub struct RawDylibUnsupportedAbi {
     #[primary_span]
     pub span: Span,
 }

compiler/rustc_metadata/src/native_libs.rs

@@ -653,6 +653,7 @@ impl<'tcx> Collector<'tcx> {
         let span = self.tcx.def_span(item);
 
         // this logic is similar to `Target::adjust_abi` (in rustc_target/src/spec/mod.rs) but errors on unsupported inputs
+        // FIXME: also call `is_abi_supported` here.
         let calling_convention = if self.tcx.sess.target.arch == "x86" {
             match abi {
                 ExternAbi::C { .. } | ExternAbi::Cdecl { .. } => DllCallingConvention::C,
@@ -679,7 +680,7 @@ impl<'tcx> Collector<'tcx> {
                     DllCallingConvention::Vectorcall(self.i686_arg_list_size(item))
                 }
                 _ => {
-                    self.tcx.dcx().emit_fatal(errors::UnsupportedAbiI686 { span });
+                    self.tcx.dcx().emit_fatal(errors::RawDylibUnsupportedAbiI686 { span });
                 }
             }
         } else {
@@ -688,7 +689,7 @@ impl<'tcx> Collector<'tcx> {
                     DllCallingConvention::C
                 }
                 _ => {
-                    self.tcx.dcx().emit_fatal(errors::UnsupportedAbi { span });
+                    self.tcx.dcx().emit_fatal(errors::RawDylibUnsupportedAbi { span });
                 }
             }
         };