handle char & -1 tag

kaist-plrg · May 27, 2024 · 48b4085 · 48b4085
1 parent fed3de7
commit 48b4085
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/must_analysis/semantics.rs b/src/must_analysis/semantics.rs
@@ -224,7 +224,7 @@ impl<'tcx> Analyzer<'tcx, '_, '_> {
             Operand::Constant(box constant) => match constant.literal {
                 ConstantKind::Ty(_) => unreachable!(),
                 ConstantKind::Unevaluated(constant, ty) => {
-                    if ty.is_integral() {
+                    if ty.is_integral() || ty.is_char() {
                         if let Ok(v) = self.tcx.const_eval_poly(constant.def) {
                             self.transfer_const_value(v, ty)
                         } else {
@@ -265,6 +265,7 @@ impl<'tcx> Analyzer<'tcx, '_, '_> {
                         };
                         OpVal::Int(v)
                     }
+                    TyKind::Char => OpVal::Int(i.try_to_u32().unwrap() as _),
                     _ => OpVal::Other,
                 },
                 Scalar::Ptr(ptr, _) => match self.tcx.global_alloc(ptr.provenance) {
@@ -850,6 +851,7 @@ macro_rules! create_cast_fn {
                     UintTy::U128 => n as $typ as u128,
                 },
                 TyKind::Bool => (n != 0) as $typ as u128,
+                TyKind::Char => (n as u32) as $typ as u128,
                 _ => panic!(),
             }
         }

diff --git a/src/tag_analysis.rs b/src/tag_analysis.rs
@@ -700,7 +700,9 @@ impl {} {{
                     &mut get_tag_method,
                     "
             {}::{} => {},",
-                    tu.name, variant_name, t
+                    tu.name,
+                    variant_name,
+                    tag_to_string(*t, &field_ty),
                 )
                 .unwrap();
                 write!(
@@ -1547,6 +1549,8 @@ fn get_root<'tcx>(expr: &'tcx Expr<'tcx>) -> &'tcx Expr<'tcx> {
 fn tag_to_string(tag: Tag, ty: &str) -> String {
     if ty == "bool" {
         (tag.0 != 0).to_string()
+    } else if ty.ends_with("c_int") {
+        (tag.0 as i32).to_string()
     } else {
         tag.to_string()
     }