From 399bb7cc628b621ac76e173a94a4613c9510ef2d Mon Sep 17 00:00:00 2001
From: Jake Fecher <jfecher11@gmail.com>
Date: Mon, 26 Aug 2024 11:48:02 -0500
Subject: [PATCH] Fix bitcasts

---
 compiler/noirc_frontend/src/elaborator/types.rs            | 6 +++---
 .../compile_success_empty/regression_5823/Nargo.toml       | 7 +++++++
 .../compile_success_empty/regression_5823/src/main.nr      | 5 +++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 test_programs/compile_success_empty/regression_5823/Nargo.toml
 create mode 100644 test_programs/compile_success_empty/regression_5823/src/main.nr

diff --git a/compiler/noirc_frontend/src/elaborator/types.rs b/compiler/noirc_frontend/src/elaborator/types.rs
index a82a4fa2d20..2ef30fa4c0d 100644
--- a/compiler/noirc_frontend/src/elaborator/types.rs
+++ b/compiler/noirc_frontend/src/elaborator/types.rs
@@ -1041,9 +1041,6 @@ impl<'context> Elaborator<'context> {
             // Matches on TypeVariable must be first so that we follow any type
             // bindings.
             (TypeVariable(int, _), other) | (other, TypeVariable(int, _)) => {
-                if let TypeBinding::Bound(binding) = &*int.borrow() {
-                    return self.infix_operand_type_rules(binding, op, other, span);
-                }
                 if op.kind == BinaryOpKind::ShiftLeft || op.kind == BinaryOpKind::ShiftRight {
                     self.unify(
                         rhs_type,
@@ -1058,6 +1055,9 @@ impl<'context> Elaborator<'context> {
                     };
                     return Ok((lhs_type.clone(), use_impl));
                 }
+                if let TypeBinding::Bound(binding) = &*int.borrow() {
+                    return self.infix_operand_type_rules(binding, op, other, span);
+                }
                 let use_impl = self.bind_type_variables_for_infix(lhs_type, op, rhs_type, span);
                 Ok((other.clone(), use_impl))
             }
diff --git a/test_programs/compile_success_empty/regression_5823/Nargo.toml b/test_programs/compile_success_empty/regression_5823/Nargo.toml
new file mode 100644
index 00000000000..a2de5c954b9
--- /dev/null
+++ b/test_programs/compile_success_empty/regression_5823/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "regression_5823"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.33.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/test_programs/compile_success_empty/regression_5823/src/main.nr b/test_programs/compile_success_empty/regression_5823/src/main.nr
new file mode 100644
index 00000000000..f615564fae2
--- /dev/null
+++ b/test_programs/compile_success_empty/regression_5823/src/main.nr
@@ -0,0 +1,5 @@
+fn main() {
+    let x = 1 as u64;
+    let y = 2 as u8;
+    assert_eq(x << y, 4);
+}