Auto merge of #147524 - azhogin:azhogin/intrinsic-query-opt, r=<try>

intrinsic_raw query optimization attempt #2

Author: rust-bors[bot]

Cargo.lock

@@ -3484,6 +3484,7 @@ dependencies = [
  "rustc_infer",
  "rustc_lexer",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_mir_dataflow",
  "rustc_session",
@@ -3620,6 +3621,7 @@ dependencies = [
  "rustc_index",
  "rustc_infer",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_mir_dataflow",
  "rustc_session",
@@ -3888,6 +3890,7 @@ dependencies = [
  "rustc_infer",
  "rustc_lint_defs",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_session",
  "rustc_span",
@@ -3937,6 +3940,7 @@ dependencies = [
  "rustc_infer",
  "rustc_lint",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_session",
  "rustc_span",
@@ -4081,6 +4085,7 @@ dependencies = [
  "rustc_index",
  "rustc_infer",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_parse_format",
  "rustc_session",
@@ -4219,6 +4224,7 @@ dependencies = [
  "rustc_infer",
  "rustc_lint",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_pattern_analysis",
  "rustc_session",
@@ -4241,6 +4247,7 @@ dependencies = [
  "rustc_graphviz",
  "rustc_index",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_span",
  "smallvec",
@@ -4265,6 +4272,7 @@ dependencies = [
  "rustc_index",
  "rustc_infer",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_mir_build",
  "rustc_mir_dataflow",
@@ -4286,6 +4294,7 @@ dependencies = [
  "rustc_fluent_macro",
  "rustc_hir",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_session",
  "rustc_span",
@@ -4358,6 +4367,7 @@ dependencies = [
  "rustc_hir",
  "rustc_index",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_privacy",
  "rustc_session",
@@ -4438,6 +4448,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_hir",
  "rustc_hir_pretty",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_session",
  "rustc_span",
@@ -4665,6 +4676,7 @@ dependencies = [
  "rustc_hir",
  "rustc_infer",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_next_trait_solver",
  "rustc_parse_format",
@@ -4716,6 +4728,7 @@ dependencies = [
  "rustc_index",
  "rustc_infer",
  "rustc_macros",
+ "rustc_metadata",
  "rustc_middle",
  "rustc_session",
  "rustc_span",

compiler/rustc_borrowck/Cargo.toml

@@ -18,6 +18,7 @@ rustc_index = { path = "../rustc_index" }
 rustc_infer = { path = "../rustc_infer" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_macros = { path = "../rustc_macros" }
+rustc_metadata = { path = "../rustc_metadata" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
 rustc_session = { path = "../rustc_session" }

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -19,6 +19,7 @@ use rustc_infer::infer::{
     BoundRegionConversionTime, InferCtxt, NllRegionVariableOrigin, RegionVariableOrigin,
 };
 use rustc_infer::traits::PredicateObligations;
+use rustc_metadata::TyCtxtMetadataExt;
 use rustc_middle::mir::visit::{NonMutatingUseContext, PlaceContext, Visitor};
 use rustc_middle::mir::*;
 use rustc_middle::traits::query::NoSolution;

compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

@@ -18,6 +18,7 @@ mod llvm_x86;
 mod simd;
 
 use cranelift_codegen::ir::AtomicRmwOp;
+use rustc_metadata::TyCtxtMetadataExt;
 use rustc_middle::ty;
 use rustc_middle::ty::GenericArgsRef;
 use rustc_middle::ty::layout::ValidityRequirement;

compiler/rustc_codegen_ssa/src/mir/block.rs

@@ -6,6 +6,7 @@ use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
 use rustc_data_structures::packed::Pu128;
 use rustc_hir::lang_items::LangItem;
 use rustc_lint_defs::builtin::TAIL_CALL_TRACK_CALLER;
+use rustc_metadata::TyCtxtMetadataExt;
 use rustc_middle::mir::{self, AssertKind, InlineAsmMacro, SwitchTargets, UnwindTerminateReason};
 use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf, ValidityRequirement};
 use rustc_middle::ty::print::{with_no_trimmed_paths, with_no_visible_paths};

compiler/rustc_const_eval/Cargo.toml

@@ -16,6 +16,7 @@ rustc_hir = { path = "../rustc_hir" }
 rustc_index = { path = "../rustc_index" }
 rustc_infer = { path = "../rustc_infer" }
 rustc_macros = { path = "../rustc_macros" }
+rustc_metadata = { path = "../rustc_metadata" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
 rustc_session = { path = "../rustc_session" }

compiler/rustc_const_eval/src/check_consts/check.rs

@@ -12,6 +12,7 @@ use rustc_hir::def_id::DefId;
 use rustc_hir::{self as hir, LangItem};
 use rustc_index::bit_set::DenseBitSet;
 use rustc_infer::infer::TyCtxtInferExt;
+use rustc_metadata::TyCtxtMetadataExt;
 use rustc_middle::mir::visit::Visitor;
 use rustc_middle::mir::*;
 use rustc_middle::span_bug;

compiler/rustc_const_eval/src/const_eval/machine.rs

@@ -7,6 +7,7 @@ use rustc_ast::Mutability;
 use rustc_data_structures::fx::{FxHashMap, FxIndexMap, IndexEntry};
 use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_hir::{self as hir, CRATE_HIR_ID, LangItem};
+use rustc_metadata::TyCtxtMetadataExt;
 use rustc_middle::mir::AssertMessage;
 use rustc_middle::mir::interpret::ReportedErrorInfo;
 use rustc_middle::query::TyCtxtAt;

compiler/rustc_const_eval/src/interpret/call.rs

@@ -6,6 +6,7 @@ use std::borrow::Cow;
 use either::{Left, Right};
 use rustc_abi::{self as abi, ExternAbi, FieldIdx, Integer, VariantIdx};
 use rustc_hir::def_id::DefId;
+use rustc_metadata::TyCtxtMetadataExt;
 use rustc_middle::ty::layout::{IntegerExt, TyAndLayout};
 use rustc_middle::ty::{self, AdtDef, Instance, Ty, VariantDef};
 use rustc_middle::{bug, mir, span_bug};

compiler/rustc_hir_analysis/Cargo.toml

@@ -23,6 +23,7 @@ rustc_index = { path = "../rustc_index" }
 rustc_infer = { path = "../rustc_infer" }
 rustc_lint_defs = { path = "../rustc_lint_defs" }
 rustc_macros = { path = "../rustc_macros" }
+rustc_metadata = { path = "../rustc_metadata" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }