Bump rust-toolchain to nightly-2021-04-25

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -1142,10 +1142,6 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         None
     }
 
-    fn fptosui_may_trap(&self, _val: Self::Value, _dest_ty: Self::Type) -> bool {
-        false
-    }
-
     fn fptoui(&mut self, val: Self::Value, dest_ty: Self::Type) -> Self::Value {
         if val.ty == dest_ty {
             val

crates/rustc_codegen_spirv/src/builder/mod.rs

@@ -217,10 +217,6 @@ impl<'a, 'tcx> Deref for Builder<'a, 'tcx> {
 }
 
 impl<'a, 'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'a, 'tcx> {
-    fn create_pgo_func_name_var(&self, _instance: Instance<'tcx>) -> Self::Value {
-        todo!()
-    }
-
     fn set_function_source_hash(&mut self, _: rustc_middle::ty::Instance<'tcx>, _: u64) -> bool {
         todo!()
     }

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -25,7 +25,7 @@ use rustc_middle::mir::Body;
 use rustc_middle::ty::layout::{HasParamEnv, HasTyCtxt};
 use rustc_middle::ty::{Instance, ParamEnv, PolyExistentialTraitRef, Ty, TyCtxt, TyS};
 use rustc_session::Session;
-use rustc_span::def_id::LOCAL_CRATE;
+use rustc_span::def_id::{DefId, LOCAL_CRATE};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{SourceFile, Span, DUMMY_SP};
 use rustc_target::abi::call::FnAbi;
@@ -425,10 +425,16 @@ impl<'tcx> DebugInfoMethods<'tcx> for CodegenCx<'tcx> {
     }
 }
 
-impl<'tcx> CoverageInfoMethods for CodegenCx<'tcx> {
+impl<'tcx> CoverageInfoMethods<'tcx> for CodegenCx<'tcx> {
     fn coverageinfo_finalize(&self) {
         todo!()
     }
+    fn get_pgo_func_name_var(&self, _: Instance<'tcx>) -> SpirvValue {
+        todo!()
+    }
+    fn define_unused_fn(&self, _: DefId) {
+        todo!()
+    }
 }
 
 impl<'tcx> AsmMethods for CodegenCx<'tcx> {

crates/rustc_codegen_spirv/src/decorations.rs

@@ -218,7 +218,7 @@ impl SerializedSpan {
 
         // Sanity check - assuming `SerializedSpan` isn't corrupted, this assert
         // could only ever fail because of a hash collision.
-        assert!(self.lo <= self.hi && self.hi <= file.byte_length());
+        assert!(self.lo <= self.hi && self.hi <= (file.end_pos.0 - file.start_pos.0));
 
         Some(Span::with_root_ctxt(
             file.start_pos + Pos::from_u32(self.lo),

crates/rustc_codegen_spirv/src/spirv_type.rs

@@ -116,10 +116,11 @@ impl SpirvType {
                     }
                     8 | 16 | 32 | 64 => (),
                     128 => cx.zombie_with_span(result, def_span, "u128"),
-                    other => cx
-                        .tcx
-                        .sess
-                        .fatal(&format!("Integer width {} invalid for spir-v", other)),
+                    other => cx.zombie_with_span(
+                        result,
+                        def_span,
+                        &format!("Integer width {} invalid for spir-v", other),
+                    ),
                 };
                 result
             }
@@ -130,10 +131,11 @@ impl SpirvType {
                         cx.zombie_with_span(result, def_span, "f64 without OpCapability Float64")
                     }
                     32 | 64 => (),
-                    other => cx
-                        .tcx
-                        .sess
-                        .fatal(&format!("Float width {} invalid for spir-v", other)),
+                    other => cx.zombie_with_span(
+                        result,
+                        def_span,
+                        &format!("Float width {} invalid for spir-v", other),
+                    ),
                 };
                 result
             }