Merge pull request #2253 from tignear/fix/analyze-constant-folding-concat

fixes incorrect `context_width` propagation in concatenation constant folding

Author: dalance

crates/analyzer/src/ir/expression.rs

@@ -140,11 +140,11 @@ impl Expression {
             Expression::Concatenation(x) => {
                 let mut ret = Value::new(0, 0, false);
                 for (exp, rep) in x.iter() {
-                    let exp = exp.eval_value(context, context_width, signed)?;
+                    let exp = exp.eval_value(context, None, signed)?;
 
                     let rep = if let Some(rep) = rep {
                         let token = rep.token_range();
-                        let rep = rep.eval_value(context, context_width, signed)?;
+                        let rep = rep.eval_value(context, None, signed)?;
                         let rep = rep.to_usize()?;
                         context.check_size(rep, token)?
                     } else {
@@ -473,7 +473,7 @@ impl Expression {
                 let mut kind = TypeKind::Bit;
                 for (expr, repeat) in x {
                     let range = expr.token_range();
-                    let expr = expr.eval_comptime(context, context_width, signed);
+                    let expr = expr.eval_comptime(context, None, signed);
 
                     // array / type can't be operated
                     if expr.r#type.is_array() | expr.r#type.is_type() {

crates/analyzer/src/ir/tests.rs

@@ -1831,3 +1831,29 @@ module ModuleB {
 
     check_ir(code, exp);
 }
+
+#[test]
+fn concat() {
+    let code = r#"
+  module Top (
+    o: output logic<16>,
+    o2: output logic<16>,
+) {
+    assign o = {8'hff + 8'h1}; 
+    assign o2 = {8'hf0, 8'hff + 8'h1};
+}
+    "#;
+    let exp = r#"module Top {
+  output var0(o): logic<16> = 16'hxxxx;
+  output var1(o2): logic<16> = 16'hxxxx;
+
+  comb {
+    var0 = 8'h00;
+  }
+  comb {
+    var1 = 16'hf000;
+  }
+}
+"#;
+    check_ir(code, exp);
+}