Merge pull request #33 from antoyo/update-nightly-2021-06-14

Update to nightly-2021-06-14

Author: antoyo

rust-toolchain

@@ -1 +1 @@
-nightly-2021-05-18
+nightly-2021-06-14

src/archive.rs

@@ -4,6 +4,8 @@ use std::path::{Path, PathBuf};
 use rustc_session::Session;
 use rustc_codegen_ssa::back::archive::{find_library, ArchiveBuilder};
 use rustc_codegen_ssa::METADATA_FILENAME;
+use rustc_data_structures::temp_dir::MaybeTempDir;
+use rustc_middle::middle::cstore::DllImport;
 use rustc_span::symbol::Symbol;
 
 struct ArchiveConfig<'a> {
@@ -235,6 +237,10 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
             self.config.sess.fatal(&format!("Ranlib exited with code {:?}", status.code()));
         }
     }
+
+    fn inject_dll_import_lib(&mut self, lib_name: &str, dll_imports: &[DllImport], tmpdir: &MaybeTempDir) {
+        unimplemented!();
+    }
 }
 
 impl<'a> ArArchiveBuilder<'a> {

src/asm.rs

@@ -455,6 +455,7 @@ fn reg_to_gcc(reg: InlineAsmRegOrRegClass) -> String {
             | InlineAsmRegClass::Arm(ArmInlineAsmRegClass::qreg_low4) => unimplemented!(),
             InlineAsmRegClass::Arm(ArmInlineAsmRegClass::dreg)
             | InlineAsmRegClass::Arm(ArmInlineAsmRegClass::qreg) => unimplemented!(),
+            InlineAsmRegClass::Bpf(_) => unimplemented!(),
             InlineAsmRegClass::Hexagon(HexagonInlineAsmRegClass::reg) => unimplemented!(),
             InlineAsmRegClass::Mips(MipsInlineAsmRegClass::reg) => unimplemented!(),
             InlineAsmRegClass::Mips(MipsInlineAsmRegClass::freg) => unimplemented!(),
@@ -504,6 +505,7 @@ fn dummy_output_type<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, reg: InlineAsmRegCl
         | InlineAsmRegClass::Arm(ArmInlineAsmRegClass::qreg_low4) => {
             unimplemented!()
         }
+        InlineAsmRegClass::Bpf(_) => unimplemented!(),
         InlineAsmRegClass::Hexagon(HexagonInlineAsmRegClass::reg) => cx.type_i32(),
         InlineAsmRegClass::Mips(MipsInlineAsmRegClass::reg) => cx.type_i32(),
         InlineAsmRegClass::Mips(MipsInlineAsmRegClass::freg) => cx.type_f32(),
@@ -607,6 +609,7 @@ fn modifier_to_gcc(arch: InlineAsmArch, reg: InlineAsmRegClass, modifier: Option
                 modifier
             }*/
         }
+        InlineAsmRegClass::Bpf(_) => unimplemented!(),
         InlineAsmRegClass::Hexagon(_) => unimplemented!(),
         InlineAsmRegClass::Mips(_) => unimplemented!(),
         InlineAsmRegClass::Nvptx(_) => unimplemented!(),

src/builder.rs

@@ -1373,6 +1373,16 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
         else if value_type.is_vector().is_some() {
             panic!();
         }
+        else if let Some(pointer_type) = value_type.get_pointee() {
+            if let Some(struct_type) = pointer_type.is_struct() {
+                // NOTE: hack to workaround a limitation of the rustc API: see comment on
+                // CodegenCx.structs_as_pointer
+                aggregate_value.dereference_field(None, struct_type.get_field(idx as i32)).to_rvalue()
+            }
+            else {
+                panic!("Unexpected type {:?}", value_type);
+            }
+        }
         else if let Some(struct_type) = value_type.is_struct() {
             aggregate_value.access_field(None, struct_type.get_field(idx as i32)).to_rvalue()
         }

src/lib.rs

@@ -48,7 +48,6 @@ mod debuginfo;
 mod declare;
 mod intrinsic;
 mod mangled_std_symbols;
-mod metadata;
 mod mono_item;
 mod type_;
 mod type_of;
@@ -99,16 +98,6 @@ impl CodegenBackend for GccCodegenBackend {
         }
     }
 
-    fn metadata_loader(&self) -> Box<dyn MetadataLoader + Sync> {
-        Box::new(crate::metadata::GccMetadataLoader)
-    }
-
-    fn provide(&self, _providers: &mut Providers) {
-    }
-
-    fn provide_extern(&self, _providers: &mut Providers) {
-    }
-
     fn codegen_crate<'tcx>(&self, tcx: TyCtxt<'tcx>, metadata: EncodedMetadata, need_metadata_module: bool) -> Box<dyn Any> {
         let target_cpu = target_cpu(tcx.sess);
         let res = codegen_crate(self.clone(), tcx, target_cpu.to_string(), metadata, need_metadata_module);
@@ -135,7 +124,7 @@ impl CodegenBackend for GccCodegenBackend {
                 sess,
                 &codegen_results,
                 outputs,
-                &codegen_results.crate_name.as_str(),
+                &codegen_results.crate_info.local_crate_name.as_str(),
             );
         });