save work

Author: ZelboK

crates/rustc_codegen_nvvm/src/back.rs

@@ -13,7 +13,7 @@ use rustc_codegen_ssa::{
     CompiledModule, ModuleCodegen, ModuleKind,
 };
 use rustc_data_structures::small_c_str::SmallCStr;
-use rustc_errors::{FatalError, Handler};
+use rustc_errors::{FatalError, Handler, DiagnosticMessage, DiagnosticBuilder};
 use rustc_fs_util::path_to_c_string;
 use rustc_middle::bug;
 use rustc_middle::mir::mono::MonoItem;
@@ -22,6 +22,7 @@ use rustc_session::config::{self, DebugInfo, OutputType};
 use rustc_session::Session;
 use rustc_span::Symbol;
 use rustc_target::spec::{CodeModel, RelocModel};
+use std::convert::TryFrom;
 use std::ffi::CString;
 use std::sync::Arc;
 use std::{
@@ -31,7 +32,7 @@ use std::{
 
 pub fn llvm_err(handler: &Handler, msg: &str) -> FatalError {
     match llvm::last_error() {
-        Some(err) => handler.fatal(&format!("{}: {}", msg, err)),
+        Some(err) => handler.fatal(format!("{}: {}", msg, err)),
         None => handler.fatal(msg),
     }
 }
@@ -220,7 +221,7 @@ pub(crate) unsafe fn codegen(
 
     if let Err(e) = std::fs::write(&out, data) {
         let msg = format!("failed to write bytecode to {}: {}", out.display(), e);
-        diag_handler.err(&msg);
+        diag_handler.err(msg);
     }
 
     Ok(CompiledModule {
@@ -387,7 +388,7 @@ pub(crate) unsafe fn optimize(
 
         for pass in &config.passes {
             if !addpass(pass) {
-                diag_handler.warn(&format!("unknown pass `{}`, ignoring", pass));
+                diag_handler.warn(format!("unknown pass `{}`, ignoring", pass));
             }
         }
 

crates/rustc_codegen_nvvm/src/debug_info/create_scope_map.rs

@@ -6,7 +6,7 @@ use crate::context::CodegenCx;
 use crate::llvm;
 use crate::llvm::debuginfo::{DILocation, DIScope};
 use rustc_middle::mir::{Body, SourceScope};
-use rustc_middle::ty::{self, Instance};
+use rustc_middle::ty::{self, Instance, EarlyBinder};
 use rustc_session::config::DebugInfo;
 
 use rustc_index::bit_set::BitSet;
@@ -110,7 +110,7 @@ fn make_mir_scope<'ll, 'tcx>(
             let callee = cx.tcx.subst_and_normalize_erasing_regions(
                 instance.substs,
                 ty::ParamEnv::reveal_all(),
-                callee,
+                EarlyBinder::bind(callee),
             );
             let callee_fn_abi = cx.fn_abi_of_instance(callee, ty::List::empty());
             cx.dbg_scope_fn(callee, callee_fn_abi, None)

crates/rustc_codegen_nvvm/src/debug_info/metadata.rs

@@ -7,6 +7,7 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::def::CtorKind;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_abi::FieldIdx;
 use rustc_middle::mir::{self, GeneratorLayout};
 use rustc_middle::ty::layout::{self, IntegerExt, LayoutOf, PrimitiveExt, TyAndLayout};
 use rustc_middle::ty::subst::GenericArgKind;
@@ -1212,7 +1213,7 @@ fn closure_saved_names_of_captured_variables(tcx: TyCtxt<'_>, def_id: DefId) ->
         .iter()
         .filter_map(|var| {
             let is_ref = match var.value {
-                mir::VarDebugInfoContents::Place(place) if place.local == mir::Local::new(1) => {
+                mir::VarDebugInfoContents::Place(place) if place.local == rustc_middle::mir::Local::new(1) => {
                     // The projection is either `[.., Field, Deref]` or `[.., Field]`. It
                     // implies whether the variable is captured by value or by reference.
                     matches!(place.projection.last().unwrap(), mir::ProjectionElem::Deref)
@@ -1676,7 +1677,7 @@ impl<'tcx> VariantInfo<'_, 'tcx> {
     fn field_name(&self, i: usize, cx: &CodegenCx<'_, 'tcx>) -> String {
         let field_name = match *self {
             VariantInfo::Adt(variant) if variant.ctor_kind() != Some(CtorKind::Fn) => {
-                Some(variant.fields[i].ident(cx.tcx).name)
+                Some(variant.fields[FieldIdx::from_usize(i)].ident(cx.tcx).name)
             }
             VariantInfo::Generator {
                 generator_layout,

crates/rustc_codegen_nvvm/src/lib.rs

@@ -256,6 +256,8 @@ impl WriteBackendMethods for NvvmCodegenBackend {
         }
     }
 
+    type TargetMachineError;  // idk wtf im supposed to do with this but ill fix later
+
     // fn run_lto_pass_manager(
     //     _: &CodegenContext<Self>,
     //     _: &ModuleCodegen<Self::Module>,

crates/rustc_codegen_nvvm/src/link.rs

@@ -36,6 +36,12 @@ impl fmt::Debug for NvvmMetadataLoader {
         write!(f, "Placeholder until i know what to put here...: {}", self)
     }
 }
+
+impl fmt::Display for NvvmMetadataLoader {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "Placeholder until i know what to put here...: {}", self)
+    }
+}
 impl MetadataLoader for NvvmMetadataLoader {
     fn get_rlib_metadata(&self, _target: &Target,
                          filename: &Path) -> Result<OwnedSlice, String> {

crates/rustc_codegen_nvvm/src/mono_item.rs

@@ -41,7 +41,7 @@ impl<'ll, 'tcx> PreDefineMethods<'tcx> for CodegenCx<'ll, 'tcx> {
             .unwrap_or_else(|| {
                 self.sess().span_fatal(
                     self.tcx.def_span(def_id),
-                    &format!("symbol `{}` is already defined", symbol_name),
+                    format!("symbol `{}` is already defined", symbol_name),
                 )
             });