rustup update (#816)

* rustup update

* Test fixes

Author: khyperia

crates/rustc_codegen_spirv/src/abi.rs

@@ -9,7 +9,7 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::ErrorReported;
 use rustc_index::vec::Idx;
 use rustc_middle::ty::layout::{FnAbiOf, LayoutOf, TyAndLayout};
-use rustc_middle::ty::query::Providers;
+use rustc_middle::ty::query::{ExternProviders, Providers};
 use rustc_middle::ty::subst::SubstsRef;
 use rustc_middle::ty::{
     self, Const, FloatTy, GeneratorSubsts, IntTy, ParamEnv, PolyFnSig, Ty, TyCtxt, TyKind,
@@ -167,7 +167,7 @@ pub(crate) fn provide(providers: &mut Providers) {
     };
 }
 
-pub(crate) fn provide_extern(providers: &mut Providers) {
+pub(crate) fn provide_extern(providers: &mut ExternProviders) {
     // Reset providers overriden in `provide`, that need to still go through the
     // `rustc_metadata::rmeta` decoding, as opposed to being locally computed.
     providers.fn_sig = rustc_interface::DEFAULT_EXTERN_QUERY_PROVIDERS.fn_sig;

crates/rustc_codegen_spirv/src/attr.rs

@@ -236,7 +236,8 @@ fn target_from_impl_item<'tcx>(tcx: TyCtxt<'tcx>, impl_item: &hir::ImplItem<'_>)
         hir::ImplItemKind::Const(..) => Target::AssocConst,
         hir::ImplItemKind::Fn(..) => {
             let parent_hir_id = tcx.hir().get_parent_item(impl_item.hir_id());
-            let containing_item = tcx.hir().expect_item(parent_hir_id);
+            let parent_local_def_id = tcx.hir().local_def_id(parent_hir_id);
+            let containing_item = tcx.hir().expect_item(parent_local_def_id);
             let containing_impl_is_for_trait = match &containing_item.kind {
                 hir::ItemKind::Impl(hir::Impl { of_trait, .. }) => of_trait.is_some(),
                 _ => unreachable!("parent of an ImplItem must be an Impl"),

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -991,6 +991,14 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         // ignore
     }
 
+    fn type_metadata(&mut self, _function: Self::Function, _typeid: String) {
+        // ignore
+    }
+
+    fn typeid_metadata(&mut self, _typeid: String) -> Self::Value {
+        todo!()
+    }
+
     fn store(&mut self, val: Self::Value, ptr: Self::Value, _align: Align) -> Self::Value {
         let ptr_elem_ty = match self.lookup_type(ptr.ty) {
             SpirvType::Pointer { pointee } => pointee,

crates/rustc_codegen_spirv/src/builder/intrinsics.rs

@@ -350,9 +350,8 @@ impl<'a, 'tcx> IntrinsicCallMethods<'tcx> for Builder<'a, 'tcx> {
         cond
     }
 
-    fn sideeffect(&mut self) {
-        // TODO: This is currently ignored.
-        // It corresponds to the llvm.sideeffect intrinsic - does spir-v have an equivalent?
+    fn type_test(&mut self, _pointer: Self::Value, _typeid: Self::Value) -> Self::Value {
+        todo!()
     }
 
     fn va_start(&mut self, _val: Self::Value) -> Self::Value {

crates/rustc_codegen_spirv/src/builder/mod.rs

@@ -329,7 +329,7 @@ impl<'a, 'tcx> ArgAbiMethods<'tcx> for Builder<'a, 'tcx> {
 impl<'a, 'tcx> AbiBuilderMethods<'tcx> for Builder<'a, 'tcx> {
     fn apply_attrs_callsite(&mut self, _fn_abi: &FnAbi<'tcx, Ty<'tcx>>, _callsite: Self::Value) {}
 
-    fn get_param(&self, index: usize) -> Self::Value {
+    fn get_param(&mut self, index: usize) -> Self::Value {
         self.function_parameter_values.borrow()[&self.current_fn.def(self)][index]
     }
 }

crates/rustc_codegen_spirv/src/builder/spirv_asm.rs

@@ -13,7 +13,7 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::traits::{AsmBuilderMethods, InlineAsmOperandRef};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir::LlvmInlineAsmInner;
-use rustc_middle::bug;
+use rustc_middle::{bug, ty::Instance};
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::asm::{InlineAsmRegClass, InlineAsmRegOrRegClass, SpirVInlineAsmRegClass};
 use std::convert::TryFrom;
@@ -70,6 +70,7 @@ impl<'a, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'tcx> {
         operands: &[InlineAsmOperandRef<'tcx, Self>],
         options: InlineAsmOptions,
         _line_spans: &[Span],
+        _instance: Instance<'_>,
     ) {
         const SUPPORTED_OPTIONS: InlineAsmOptions = InlineAsmOptions::NORETURN;
         let unsupported_options = options & !SUPPORTED_OPTIONS;

crates/rustc_codegen_spirv/src/lib.rs

@@ -290,7 +290,7 @@ impl CodegenBackend for SpirvCodegenBackend {
         crate::attr::provide(providers);
     }
 
-    fn provide_extern(&self, providers: &mut query::Providers) {
+    fn provide_extern(&self, providers: &mut query::ExternProviders) {
         crate::abi::provide_extern(providers);
     }
 

crates/spirv-builder/src/lib.rs

@@ -68,7 +68,7 @@
 )]
 // END - Embark standard lints v0.4
 // crate-specific exceptions:
-#![allow()]
+// #![allow()]
 
 mod depfile;
 #[cfg(feature = "watch")]

crates/spirv-std/src/lib.rs

@@ -2,12 +2,14 @@
 #![cfg_attr(
     target_arch = "spirv",
     feature(
+        abi_unadjusted,
         asm,
-        register_attr,
-        repr_simd,
+        asm_const,
+        asm_experimental_arch,
         core_intrinsics,
         lang_items,
-        abi_unadjusted
+        register_attr,
+        repr_simd,
     ),
     register_attr(spirv)
 )]

examples/runners/ash/src/main.rs

@@ -68,7 +68,7 @@
 )]
 // END - Embark standard lints v0.4
 // crate-specific exceptions:
-#![allow()]
+// #![allow()]
 
 use ash::{
     extensions::{ext, khr},