Remove long-obsolete is_blocklisted_fn mechanism.

Author: eddyb

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -76,12 +76,6 @@ impl<'tcx> CodegenCx<'tcx> {
             other => bug!("fn_abi type {}", other.debug(function_type, self)),
         };
 
-        if crate::is_blocklisted_fn(self.tcx, &self.sym, instance) {
-            // This can happen if we call a blocklisted function in another crate.
-            let result = self.undef(function_type);
-            self.zombie_with_span(result.def_cx(self), span, "called blocklisted fn");
-            return result;
-        }
         let fn_id = {
             let mut emit = self.emit_global();
             let fn_id = emit

crates/rustc_codegen_spirv/src/lib.rs

@@ -157,10 +157,10 @@ use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
 use rustc_middle::mir::mono::{MonoItem, MonoItemData};
 use rustc_middle::mir::pretty::write_mir_pretty;
 use rustc_middle::ty::print::with_no_trimmed_paths;
-use rustc_middle::ty::{self, Instance, InstanceKind, TyCtxt};
+use rustc_middle::ty::{InstanceKind, TyCtxt};
 use rustc_session::Session;
 use rustc_session::config::{self, OutputFilenames, OutputType};
-use rustc_span::symbol::{Symbol, sym};
+use rustc_span::symbol::Symbol;
 use std::any::Any;
 use std::fs::{File, create_dir_all};
 use std::io::Cursor;
@@ -184,45 +184,6 @@ fn dump_mir(tcx: TyCtxt<'_>, mono_items: &[(MonoItem<'_>, MonoItemData)], path:
     }
 }
 
-fn is_blocklisted_fn<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    sym: &symbols::Symbols,
-    instance: Instance<'tcx>,
-) -> bool {
-    // TODO: These sometimes have a constant value of an enum variant with a hole
-    if let InstanceKind::Item(def_id) = instance.def {
-        if let Some(debug_trait_def_id) = tcx.get_diagnostic_item(sym::Debug) {
-            // Helper for detecting `<_ as core::fmt::Debug>::fmt` (in impls).
-            let is_debug_fmt_method = |def_id| match tcx.opt_associated_item(def_id) {
-                Some(assoc) if assoc.ident(tcx).name == sym::fmt => match assoc.container {
-                    ty::AssocItemContainer::Impl => {
-                        let impl_def_id = assoc.container_id(tcx);
-                        tcx.impl_trait_ref(impl_def_id)
-                            .map(|tr| tr.skip_binder().def_id)
-                            == Some(debug_trait_def_id)
-                    }
-                    ty::AssocItemContainer::Trait => false,
-                },
-                _ => false,
-            };
-
-            if is_debug_fmt_method(def_id) {
-                return true;
-            }
-
-            if tcx.opt_item_ident(def_id).map(|i| i.name) == Some(sym.fmt_decimal) {
-                if let Some(parent_def_id) = tcx.opt_parent(def_id) {
-                    if is_debug_fmt_method(parent_def_id) {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    false
-}
-
 // TODO: Should this store Vec or Module?
 struct SpirvModuleBuffer(Vec<u32>);
 
@@ -470,11 +431,6 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
             }
 
             for &(mono_item, mono_item_data) in mono_items.iter() {
-                if let MonoItem::Fn(instance) = mono_item {
-                    if is_blocklisted_fn(cx.tcx, &cx.sym, instance) {
-                        continue;
-                    }
-                }
                 mono_item.predefine::<Builder<'_, '_>>(
                     &cx,
                     mono_item_data.linkage,
@@ -484,11 +440,6 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
 
             // ... and now that we have everything pre-defined, fill out those definitions.
             for &(mono_item, _) in mono_items.iter() {
-                if let MonoItem::Fn(instance) = mono_item {
-                    if is_blocklisted_fn(cx.tcx, &cx.sym, instance) {
-                        continue;
-                    }
-                }
                 mono_item.define::<Builder<'_, '_>>(&cx);
             }
 

crates/rustc_codegen_spirv/src/symbols.rs

@@ -13,9 +13,6 @@ use std::rc::Rc;
 /// already exists, deduplicating it if so. This makes things like comparison and cloning really cheap. So, this struct
 /// is to allocate all our keywords up front and intern them all, so we can do comparisons really easily and fast.
 pub struct Symbols {
-    // Used by `is_blocklisted_fn`.
-    pub fmt_decimal: Symbol,
-
     pub discriminant: Symbol,
     pub rust_gpu: Symbol,
     pub spirv: Symbol,
@@ -403,8 +400,6 @@ impl Symbols {
             assert!(old.is_none());
         }
         Self {
-            fmt_decimal: Symbol::intern("fmt_decimal"),
-
             discriminant: Symbol::intern("discriminant"),
             rust_gpu: Symbol::intern("rust_gpu"),
             spirv: Symbol::intern("spirv"),