Merge branch 'bjorn/jit/aarch64-nit-pick' into maint

* bjorn/jit/aarch64-nit-pick: AArch64: Correct test of int-typed return value
bjorng · Nov 28, 2023 · 25dd71a · 25dd71a
2 parents f58a944 + 63d1bee
commit 25dd71a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/erts/emulator/beam/jit/arm/instr_common.cpp b/erts/emulator/beam/jit/arm/instr_common.cpp
@@ -1500,7 +1500,7 @@ void BeamModuleAssembler::emit_is_eq_exact(const ArgLabel &Fail,
     runtime_call<2>(eq);
     emit_leave_runtime();
 
-    a.cbz(ARG1, resolve_beam_label(Fail, disp1MB));
+    a.cbz(ARG1.w(), resolve_beam_label(Fail, disp1MB));
 
     a.bind(next);
 }
@@ -1578,7 +1578,7 @@ void BeamModuleAssembler::emit_is_ne_exact(const ArgLabel &Fail,
 
     emit_leave_runtime();
 
-    a.cbnz(ARG1, resolve_beam_label(Fail, disp1MB));
+    a.cbnz(ARG1.w(), resolve_beam_label(Fail, disp1MB));
 
     a.bind(next);
 }

diff --git a/erts/emulator/beam/jit/arm/instr_guard_bifs.cpp b/erts/emulator/beam/jit/arm/instr_guard_bifs.cpp
@@ -81,7 +81,7 @@ void BeamGlobalAssembler::emit_bif_is_eq_exact_shared() {
     emit_leave_runtime();
     emit_leave_runtime_frame();
 
-    a.cbz(ARG1, fail);
+    a.cbz(ARG1.w(), fail);
 
     a.bind(succ);
     {
@@ -113,7 +113,7 @@ void BeamGlobalAssembler::emit_bif_is_ne_exact_shared() {
     emit_leave_runtime();
     emit_leave_runtime_frame();
 
-    a.cbnz(ARG1, fail);
+    a.cbnz(ARG1.w(), fail);
 
     a.bind(succ);
     {