Add Constness::Comptime

Author: oli-obk

compiler/rustc_hir/src/hir.rs

@@ -4226,6 +4226,7 @@ impl fmt::Display for Safety {
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Encodable, Decodable, HashStable_Generic)]
 #[derive(Default)]
 pub enum Constness {
+    Comptime,
     Const,
     #[default]
     NotConst,
@@ -4234,6 +4235,7 @@ pub enum Constness {
 impl fmt::Display for Constness {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str(match *self {
+            Self::Comptime => "comptime",
             Self::Const => "const",
             Self::NotConst => "non-const",
         })

compiler/rustc_hir_pretty/src/lib.rs

@@ -2571,6 +2571,7 @@ impl<'a> State<'a> {
         match s {
             hir::Constness::NotConst => {}
             hir::Constness::Const => self.word_nbsp("const"),
+            hir::Constness::Comptime => { /* printed as an attribute */ }
         }
     }
 

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -1524,10 +1524,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
             }
             if should_encode_constness(def_kind) {
                 let constness = self.tcx.constness(def_id);
-                match constness {
-                    hir::Constness::Const => self.tables.constness.set(def_id.index, constness),
-                    hir::Constness::NotConst => {}
-                }
+                self.tables.constness.set(def_id.index, constness)
             }
             if let DefKind::Fn | DefKind::AssocFn = def_kind {
                 let asyncness = tcx.asyncness(def_id);

compiler/rustc_metadata/src/rmeta/table.rs

@@ -37,8 +37,8 @@ impl IsDefault for ty::Asyncness {
 impl IsDefault for hir::Constness {
     fn is_default(&self) -> bool {
         match self {
-            rustc_hir::Constness::Const => false,
-            rustc_hir::Constness::NotConst => true,
+            hir::Constness::Const | hir::Constness::Comptime => false,
+            hir::Constness::NotConst => true,
         }
     }
 }
@@ -200,6 +200,7 @@ fixed_size_enum! {
     hir::Constness {
         ( NotConst )
         ( Const    )
+        ( Comptime )
     }
 }
 
@@ -343,6 +344,7 @@ impl FixedSizeEncoding for hir::Constness {
         match b[0] {
             0 => hir::Constness::NotConst,
             1 => hir::Constness::Const,
+            2 => hir::Constness::Comptime,
             _ => unreachable!(),
         }
     }
@@ -353,6 +355,7 @@ impl FixedSizeEncoding for hir::Constness {
         b[0] = match self {
             hir::Constness::NotConst => 0,
             hir::Constness::Const => 1,
+            hir::Constness::Comptime => 2,
         }
     }
 }

compiler/rustc_middle/src/ty/adt.rs

@@ -247,6 +247,7 @@ impl<'tcx> rustc_type_ir::inherent::AdtDef<TyCtxt<'tcx>> for AdtDef<'tcx> {
 
     fn destructor(self, tcx: TyCtxt<'tcx>) -> Option<AdtDestructorKind> {
         Some(match tcx.constness(self.destructor(tcx)?.did) {
+            hir::Constness::Comptime => todo!("FIXME(comptime)"),
             hir::Constness::Const => AdtDestructorKind::Const,
             hir::Constness::NotConst => AdtDestructorKind::NotConst,
         })

compiler/rustc_trait_selection/src/traits/effects.rs

@@ -435,6 +435,7 @@ fn evaluate_host_effect_for_destruct_goal<'tcx>(
                 .map(|field| ty::TraitRef::new(tcx, destruct_def_id, [field.ty(tcx, args)]))
                 .collect();
             match adt_def.destructor(tcx).map(|dtor| tcx.constness(dtor.did)) {
+                Some(hir::Constness::Comptime) => todo!("FIXME(comptime)"),
                 // `Drop` impl exists, but it's not const. Type cannot be `[const] Destruct`.
                 Some(hir::Constness::NotConst) => return Err(EvaluationFailure::NoSolution),
                 // `Drop` impl exists, and it's const. Require `Ty: [const] Drop` to hold.
@@ -530,6 +531,8 @@ fn evaluate_host_effect_for_fn_goal<'tcx>(
     };
 
     match tcx.constness(def) {
+        // FIXME(comptime)
+        hir::Constness::Comptime => Err(EvaluationFailure::NoSolution),
         hir::Constness::Const => Ok(tcx
             .const_conditions(def)
             .instantiate(tcx, args)

src/librustdoc/html/format.rs

@@ -1471,14 +1471,18 @@ pub(crate) fn print_constness_with_space(
     const_stab: Option<ConstStability>,
 ) -> &'static str {
     match c {
-        hir::Constness::Const => match (overall_stab, const_stab) {
+        hir::Constness::Comptime | hir::Constness::Const => match (overall_stab, const_stab) {
             // const stable...
             (_, Some(ConstStability { level: StabilityLevel::Stable { .. }, .. }))
             // ...or when feature(staged_api) is not set...
             | (_, None)
             // ...or when const unstable, but overall unstable too
             | (None, Some(ConstStability { level: StabilityLevel::Unstable { .. }, .. })) => {
-                "const "
+                match c {
+                    hir::Constness::Comptime => "",
+                    hir::Constness::Const => "const ",
+                    _ => unreachable!(),
+                }
             }
             // const unstable (and overall stable)
             (Some(_), Some(ConstStability { level: StabilityLevel::Unstable { .. }, .. })) => "",