Return a struct from query intrinsic to be able to add another field in the next commit

Author: oli-obk

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -1667,7 +1667,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
  // (Eventually this should use const-generics, but those are not up for the task yet:
  // https://github.com/rust-lang/rust/issues/85229.)
  if let Some(name @ (sym::simd_shuffle | sym::simd_insert | sym::simd_extract)) =
- self.tcx().intrinsic(def_id)
+ self.tcx().intrinsic(def_id).map(|i| i.name)
  {
  let idx = match name {
  sym::simd_shuffle => 2,

compiler/rustc_codegen_ssa/src/mir/block.rs

@@ -17,7 +17,7 @@ use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf, ValidityRequirement};
 use rustc_middle::ty::print::{with_no_trimmed_paths, with_no_visible_paths};
 use rustc_middle::ty::{self, Instance, Ty};
 use rustc_session::config::OptLevel;
-use rustc_span::{source_map::Spanned, sym, Span, Symbol};
+use rustc_span::{source_map::Spanned, sym, Span};
 use rustc_target::abi::call::{ArgAbi, FnAbi, PassMode, Reg};
 use rustc_target::abi::{self, HasDataLayout, WrappingRange};
 use rustc_target::spec::abi::Abi;
@@ -680,7 +680,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  &mut self,
  helper: &TerminatorCodegenHelper<'tcx>,
  bx: &mut Bx,
- intrinsic: Option<Symbol>,
+ intrinsic: Option<ty::IntrinsicDef>,
  instance: Option<Instance<'tcx>>,
  source_info: mir::SourceInfo,
  target: Option<mir::BasicBlock>,
@@ -690,7 +690,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  // Emit a panic or a no-op for `assert_*` intrinsics.
  // These are intrinsics that compile to panics so that we can get a message
  // which mentions the offending type, even from a const context.
- let panic_intrinsic = intrinsic.and_then(|s| ValidityRequirement::from_intrinsic(s));
+ let panic_intrinsic = intrinsic.and_then(|i| ValidityRequirement::from_intrinsic(i.name));
  if let Some(requirement) = panic_intrinsic {
  let ty = instance.unwrap().args.type_at(0);
 
@@ -826,7 +826,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  // The arguments we'll be passing. Plus one to account for outptr, if used.
  let arg_count = fn_abi.args.len() + fn_abi.ret.is_indirect() as usize;
 
- if intrinsic == Some(sym::caller_location) {
+ if matches!(intrinsic, Some(ty::IntrinsicDef { name: sym::caller_location, .. })) {
  return if let Some(target) = target {
  let location =
  self.get_caller_location(bx, mir::SourceInfo { span: fn_span, ..source_info });
@@ -846,7 +846,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  }
 
  let instance = match intrinsic {
- None | Some(sym::drop_in_place) => instance,
+ None | Some(ty::IntrinsicDef { name: sym::drop_in_place, .. }) => instance,
  Some(intrinsic) => {
  let mut llargs = Vec::with_capacity(1);
  let ret_dest = self.make_return_dest(
@@ -873,7 +873,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  // The indices passed to simd_shuffle in the
  // third argument must be constant. This is
  // checked by the type-checker.
- if i == 2 && intrinsic == sym::simd_shuffle {
+ if i == 2 && intrinsic.name == sym::simd_shuffle {
  if let mir::Operand::Constant(constant) = &arg.node {
  let (llval, ty) = self.simd_shuffle_indices(bx, constant);
  return OperandRef {

compiler/rustc_hir_analysis/src/check/check.rs

@@ -527,12 +527,12 @@ pub(crate) fn check_item_type(tcx: TyCtxt<'_>, def_id: LocalDefId) {
  check_enum(tcx, def_id);
  }
  DefKind::Fn => {
- if let Some(name) = tcx.intrinsic(def_id) {
+ if let Some(i) = tcx.intrinsic(def_id) {
  intrinsic::check_intrinsic_type(
  tcx,
  def_id,
  tcx.def_ident_span(def_id).unwrap(),
- name,
+ i.name,
  Abi::Rust,
  )
  }

compiler/rustc_metadata/src/rmeta/decoder.rs

@@ -1749,7 +1749,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
  self.root.tables.attr_flags.get(self, index)
  }
 
- fn get_intrinsic(self, index: DefIndex) -> Option<Symbol> {
+ fn get_intrinsic(self, index: DefIndex) -> Option<ty::IntrinsicDef> {
  self.root.tables.intrinsic.get(self, index).map(|d| d.decode(self))
  }
 

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -375,7 +375,7 @@ macro_rules! define_tables {
 
 define_tables! {
 - defaulted:
- intrinsic: Table<DefIndex, Option<LazyValue<Symbol>>>,
+ intrinsic: Table<DefIndex, Option<LazyValue<ty::IntrinsicDef>>>,
  is_macro_rules: Table<DefIndex, bool>,
  is_type_alias_impl_trait: Table<DefIndex, bool>,
  type_alias_is_lazy: Table<DefIndex, bool>,

compiler/rustc_middle/src/query/erase.rs

@@ -241,7 +241,7 @@ trivial! {
  Option<rustc_target::abi::FieldIdx>,
  Option<rustc_target::spec::PanicStrategy>,
  Option<usize>,
- Option<rustc_span::Symbol>,
+ Option<rustc_middle::ty::IntrinsicDef>,
  Result<(), rustc_errors::ErrorGuaranteed>,
  Result<(), rustc_middle::traits::query::NoSolution>,
  Result<rustc_middle::traits::EvaluationResult, rustc_middle::traits::OverflowError>,

compiler/rustc_middle/src/query/mod.rs

@@ -1760,7 +1760,7 @@ rustc_queries! {
  separate_provide_extern
  }
  /// Whether the function is an intrinsic
- query intrinsic(def_id: DefId) -> Option<Symbol> {
+ query intrinsic(def_id: DefId) -> Option<rustc_middle::ty::IntrinsicDef> {
  desc { |tcx| "fetch intrinsic name if `{}` is an intrinsic", tcx.def_path_str(def_id) }
  separate_provide_extern
  }

compiler/rustc_middle/src/ty/intrinsic.rs

@@ -2,9 +2,14 @@ use rustc_span::{def_id::DefId, Symbol};
 
 use super::TyCtxt;
 
+#[derive(Copy, Clone, Debug, Decodable, Encodable, HashStable)]
+pub struct IntrinsicDef {
+ pub name: Symbol,
+}
+
 impl TyCtxt<'_> {
  pub fn is_intrinsic(self, def_id: DefId, name: Symbol) -> bool {
  let Some(i) = self.intrinsic(def_id) else { return false };
- i == name
+ i.name == name
  }
 }

compiler/rustc_middle/src/ty/mod.rs

@@ -30,6 +30,7 @@ pub use adt::*;
 pub use assoc::*;
 pub use generic_args::*;
 pub use generics::*;
+pub use intrinsic::IntrinsicDef;
 use rustc_ast as ast;
 use rustc_ast::node_id::NodeMap;
 pub use rustc_ast_ir::{Movability, Mutability};

compiler/rustc_middle/src/ty/parameterized.rs

@@ -75,6 +75,7 @@ trivially_parameterized_over_tcx! {
  ty::Visibility<DefIndex>,
  ty::adjustment::CoerceUnsizedInfo,
  ty::fast_reject::SimplifiedType,
+ ty::IntrinsicDef,
  rustc_ast::Attribute,
  rustc_ast::DelimArgs,
  rustc_ast::expand::StrippedCfgItem<rustc_hir::def_id::DefIndex>,