Change AdtRepr to be a struct of bools and store it in a separate map

Author: voidc

chalk-integration/src/db.rs

@@ -110,7 +110,7 @@ impl RustIrDatabase<ChalkIr> for ChalkDatabase {
     }
 
     fn adt_repr(&self, id: AdtId<ChalkIr>) -> AdtRepr {
-        self.program_ir().unwrap().adt_datum(id).repr
+        self.program_ir().unwrap().adt_repr(id)
     }
 
     fn fn_def_datum(&self, id: FnDefId<ChalkIr>) -> Arc<FnDefDatum<ChalkIr>> {

chalk-integration/src/lowering.rs

@@ -412,6 +412,7 @@ impl LowerProgram for Program {
         }
 
         let mut adt_data = BTreeMap::new();
+        let mut adt_reprs = BTreeMap::new();
         let mut fn_def_data = BTreeMap::new();
         let mut closure_inputs_and_output = BTreeMap::new();
         let mut closure_closure_kind = BTreeMap::new();
@@ -446,6 +447,7 @@ impl LowerProgram for Program {
                 Item::StructDefn(ref d) => {
                     let adt_id = AdtId(raw_id);
                     adt_data.insert(adt_id, Arc::new(d.lower_adt(adt_id, &empty_env)?));
+                    adt_reprs.insert(adt_id, d.lower_adt_repr()?);
                 }
                 Item::FnDefn(ref defn) => {
                     let fn_def_id = FnDefId(raw_id);
@@ -639,6 +641,7 @@ impl LowerProgram for Program {
             fn_def_kinds,
             trait_kinds,
             adt_data,
+            adt_reprs,
             fn_def_data,
             closure_inputs_and_output,
             closure_closure_kind,
@@ -1113,17 +1116,23 @@ impl LowerAdtDefn for StructDefn {
             phantom_data: self.flags.phantom_data,
         };
 
-        let repr = match self.repr {
-            StructRepr::Rust => rust_ir::AdtRepr::Rust,
-            StructRepr::C => rust_ir::AdtRepr::C,
-            StructRepr::Packed => rust_ir::AdtRepr::Packed,
-        };
-
         Ok(rust_ir::AdtDatum {
             id: adt_id,
             binders,
             flags,
-            repr,
+        })
+    }
+}
+
+trait LowerAdtRepr {
+    fn lower_adt_repr(&self) -> LowerResult<rust_ir::AdtRepr>;
+}
+
+impl LowerAdtRepr for StructDefn {
+    fn lower_adt_repr(&self) -> LowerResult<rust_ir::AdtRepr> {
+        Ok(rust_ir::AdtRepr {
+            repr_c: self.repr.repr_c,
+            repr_packed: self.repr.repr_packed,
         })
     }
 }

chalk-integration/src/program.rs

@@ -45,6 +45,8 @@ pub struct Program {
     /// For each ADT:
     pub adt_data: BTreeMap<AdtId<ChalkIr>, Arc<AdtDatum<ChalkIr>>>,
 
+    pub adt_reprs: BTreeMap<AdtId<ChalkIr>, AdtRepr>,
+
     pub fn_def_data: BTreeMap<FnDefId<ChalkIr>, Arc<FnDefDatum<ChalkIr>>>,
 
     pub closure_inputs_and_output:
@@ -361,7 +363,7 @@ impl RustIrDatabase<ChalkIr> for Program {
     }
 
     fn adt_repr(&self, id: AdtId<ChalkIr>) -> AdtRepr {
-        self.adt_data[&id].repr
+        self.adt_reprs[&id]
     }
 
     fn fn_def_datum(&self, id: FnDefId<ChalkIr>) -> Arc<FnDefDatum<ChalkIr>> {

chalk-parse/src/ast.rs

@@ -47,16 +47,9 @@ pub struct StructFlags {
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
-pub enum StructRepr {
-    Rust,
-    C,
-    Packed,
-}
-
-impl Default for StructRepr {
-    fn default() -> Self {
-        StructRepr::Rust
-    }
+pub struct StructRepr {
+    pub repr_c: bool,
+    pub repr_packed: bool,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]

chalk-parse/src/parser.lalrpop

@@ -59,13 +59,11 @@ WellKnownTrait: WellKnownTrait = {
      "#" "[" "lang" "(" "unsize" ")" "]" => WellKnownTrait::Unsize,
 };
 
-StructRepr: StructRepr = {
-     "#" "[" "repr" "(" "C" ")" "]" => StructRepr::C,
-     "#" "[" "repr" "(" "packed" ")" "]" => StructRepr::Packed,
-};
+StructReprC: () = "#" "[" "repr" "(" "C" ")" "]";
+StructReprPacked: () = "#" "[" "repr" "(" "packed" ")" "]";
 
 StructDefn: StructDefn = {
-    <upstream:UpstreamKeyword?> <fundamental:FundamentalKeyword?> <phantom_data:PhantomDataKeyword?> <repr:StructRepr?>
+    <upstream:UpstreamKeyword?> <fundamental:FundamentalKeyword?> <phantom_data:PhantomDataKeyword?> <repr_c:StructReprC?> <repr_packed:StructReprPacked?>
         "struct" <n:Id><p:Angle<VariableKind>>
         <w:QuantifiedWhereClauses> "{" <f:Fields> "}" => StructDefn
     {
@@ -78,7 +76,10 @@ StructDefn: StructDefn = {
             fundamental: fundamental.is_some(),
             phantom_data: phantom_data.is_some(),
         },
-        repr: repr.unwrap_or_default(),
+        repr: StructRepr {
+            repr_c: repr_c.is_some(),
+            repr_packed: repr_packed.is_some(),
+        },
     }
 };
 

chalk-solve/src/rust_ir.rs

@@ -83,7 +83,6 @@ pub struct AdtDatum<I: Interner> {
     pub binders: Binders<AdtDatumBound<I>>,
     pub id: AdtId<I>,
     pub flags: AdtFlags,
-    pub repr: AdtRepr,
 }
 
 impl<I: Interner> AdtDatum<I> {
@@ -106,10 +105,9 @@ pub struct AdtFlags {
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum AdtRepr {
-    Rust,
-    C,
-    Packed,
+pub struct AdtRepr {
+    pub repr_c: bool,
+    pub repr_packed: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]

tests/lowering/mod.rs

@@ -747,6 +747,10 @@ fn struct_repr() {
 
             #[repr(packed)]
             struct Bar {}
+
+            #[repr(C)]
+            #[repr(packed)]
+            struct FooBar {}
         }
     }
 }