Skip to content

OpenQASM: Fix const propagation in bitarray-to-int promotion #3030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minestarks merged 1 commit into from
Mar 23, 2026
Merged

OpenQASM: Fix const propagation in bitarray-to-int promotion #3030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 151 additions & 0 deletions ...mpiler/qsc_openqasm_parser/src/semantic/tests/expression/binary/arithmetic_conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,3 +476,154 @@ fn bin_op_with_const_lhs_and_non_const_rhs_sized() {
"#]],
);
}

#[test]
fn int_add_bitarray_promotes_to_int() {
let source = r#"
int a = 5;
bit[4] b = "1010";
a + b;
"#;

check_stmt_kinds(
source,
&expect![[r#"
ClassicalDeclarationStmt [9-19]:
symbol_id: 8
ty_span: [9-12]
ty_exprs: <empty>
init_expr: Expr [17-18]:
ty: int
kind: Lit: Int(5)
ClassicalDeclarationStmt [28-46]:
symbol_id: 9
ty_span: [28-34]
ty_exprs:
Expr [32-33]:
ty: const uint
const_value: Int(4)
kind: Lit: Int(4)
init_expr: Expr [39-45]:
ty: bit[4]
kind: Lit: Bitstring("1010")
ExprStmt [55-61]:
expr: Expr [55-60]:
ty: int
kind: BinaryOpExpr:
op: Add
lhs: Expr [55-56]:
ty: int
kind: SymbolId(8)
rhs: Expr [59-60]:
ty: int
kind: Cast [59-60]:
ty: int
ty_exprs: <empty>
expr: Expr [59-60]:
ty: bit[4]
kind: SymbolId(9)
kind: Implicit
"#]],
);
}

#[test]
fn bitarray_add_int_promotes_to_int() {
let source = r#"
bit[4] a = "1010";
int b = 5;
a + b;
"#;

check_stmt_kinds(
source,
&expect![[r#"
ClassicalDeclarationStmt [9-27]:
symbol_id: 8
ty_span: [9-15]
ty_exprs:
Expr [13-14]:
ty: const uint
const_value: Int(4)
kind: Lit: Int(4)
init_expr: Expr [20-26]:
ty: bit[4]
kind: Lit: Bitstring("1010")
ClassicalDeclarationStmt [36-46]:
symbol_id: 9
ty_span: [36-39]
ty_exprs: <empty>
init_expr: Expr [44-45]:
ty: int
kind: Lit: Int(5)
ExprStmt [55-61]:
expr: Expr [55-60]:
ty: int
kind: BinaryOpExpr:
op: Add
lhs: Expr [55-56]:
ty: int
kind: Cast [55-56]:
ty: int
ty_exprs: <empty>
expr: Expr [55-56]:
ty: bit[4]
kind: SymbolId(8)
kind: Implicit
rhs: Expr [59-60]:
ty: int
kind: SymbolId(9)
"#]],
);
}

#[test]
fn const_int_add_non_const_bitarray_result_is_non_const() {
let source = r#"
const int a = 5;
bit[4] b = "1010";
a + b;
"#;

check_stmt_kinds(
source,
&expect![[r#"
ClassicalDeclarationStmt [9-25]:
symbol_id: 8
ty_span: [15-18]
ty_exprs: <empty>
init_expr: Expr [23-24]:
ty: const int
const_value: Int(5)
kind: Lit: Int(5)
ClassicalDeclarationStmt [34-52]:
symbol_id: 9
ty_span: [34-40]
ty_exprs:
Expr [38-39]:
ty: const uint
const_value: Int(4)
kind: Lit: Int(4)
init_expr: Expr [45-51]:
ty: bit[4]
kind: Lit: Bitstring("1010")
ExprStmt [61-67]:
expr: Expr [61-66]:
ty: int
kind: BinaryOpExpr:
op: Add
lhs: Expr [61-62]:
ty: int
kind: SymbolId(8)
rhs: Expr [65-66]:
ty: int
kind: Cast [65-66]:
ty: int
ty_exprs: <empty>
expr: Expr [65-66]:
ty: bit[4]
kind: SymbolId(9)
kind: Implicit
"#]],
);
}
22 changes: 20 additions & 2 deletions source/compiler/qsc_openqasm_parser/src/semantic/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,23 @@ impl Type {
}
}

/// Returns a copy of this type with the const qualifier set to the given value.
#[must_use]
pub fn with_const(&self, is_const: bool) -> Self {
match self {
Type::BitArray(w, _) => Type::BitArray(*w, is_const),
Type::Bit(_) => Type::Bit(is_const),
Type::Bool(_) => Type::Bool(is_const),
Type::Duration(_) => Type::Duration(is_const),
Type::Angle(w, _) => Type::Angle(*w, is_const),
Type::Complex(w, _) => Type::Complex(*w, is_const),
Type::Float(w, _) => Type::Float(*w, is_const),
Type::Int(w, _) => Type::Int(*w, is_const),
Type::UInt(w, _) => Type::UInt(*w, is_const),
other => other.clone(),
}
}

#[must_use]
pub fn is_readonly_array_ref(&self) -> bool {
match self {
Expand Down Expand Up @@ -1306,6 +1323,7 @@ pub(crate) fn try_promote_with_casting(left_type: &Type, right_type: &Type) -> T
}

fn try_promote_bitarray_to_int(left_type: &Type, right_type: &Type) -> Option<Type> {
let is_const = left_type.is_const() && right_type.is_const();
if matches!(
(left_type, right_type),
(Type::Int(..) | Type::UInt(..), Type::BitArray(..))
Expand All @@ -1318,7 +1336,7 @@ fn try_promote_bitarray_to_int(left_type: &Type, right_type: &Type) -> Option<Ty
return None;
}

return Some(left_type.clone());
return Some(left_type.with_const(is_const));
}

if matches!(
Expand All @@ -1333,7 +1351,7 @@ fn try_promote_bitarray_to_int(left_type: &Type, right_type: &Type) -> Option<Ty
return None;
}

return Some(right_type.clone());
return Some(right_type.with_const(is_const));
}
None
}
Expand Down
Loading