//! Values computed by queries that use MIR.
-use crate::mir::{self, Body, Promoted};
+use crate::mir::{Body, ConstantKind, Promoted};
use crate::ty::{self, OpaqueHiddenType, Ty, TyCtxt};
use rustc_data_structures::stable_map::FxHashMap;
use rustc_data_structures::vec_map::VecMap;
pub blame_span: Span,
// ... due to this reason.
- pub category: ConstraintCategory,
+ pub category: ConstraintCategory<'tcx>,
}
// Make sure this enum doesn't unintentionally grow
-rustc_data_structures::static_assert_size!(ConstraintCategory, 12);
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+rustc_data_structures::static_assert_size!(ConstraintCategory<'_>, 16);
/// Outlives-constraints can be categorized to determine whether and why they
/// are interesting (for error reporting). Order of variants indicates sort
/// See also `rustc_const_eval::borrow_check::constraints`.
#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash)]
#[derive(TyEncodable, TyDecodable, HashStable)]
-pub enum ConstraintCategory {
+pub enum ConstraintCategory<'tcx> {
Return(ReturnConstraint),
Yield,
UseAsConst,
///
/// We try to get the category that the closure used when reporting this.
ClosureBounds,
- CallArgument,
+
+ /// Contains the function type if available.
+ CallArgument(Option<Ty<'tcx>>),
CopyBound,
SizedBound,
Assignment,
#[derive(Copy, Clone, Debug, HashStable)]
pub struct DestructuredMirConstant<'tcx> {
pub variant: Option<VariantIdx>,
- pub fields: &'tcx [mir::ConstantKind<'tcx>],
+ pub fields: &'tcx [ConstantKind<'tcx>],
}
/// Coverage information summarized from a MIR if instrumented for source code coverage (see