File 2241-Eliminate-crash-in-bs_create_bin-on-AArch6... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2241-Eliminate-crash-in-bs_create_bin-on-AArch64-built-wi.patch of Package erlang (Revision d62921b2b3be0a6375339d79b308a5a6)

Currently displaying revision d62921b2b3be0a6375339d79b308a5a6 , Show latest

From 87007e4fee8058477c772d81bc7815768b9f96de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 8 Nov 2021 08:44:15 +0100
Subject: [PATCH] Eliminate crash in bs_create_bin on AArch64 built with DEBUG

---
 erts/emulator/beam/jit/arm/instr_bs.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/beam/jit/arm/instr_bs.cpp b/erts/emulator/beam/jit/arm/instr_bs.cpp
index 96d9c31bfd..6d38fdc81c 100644
--- a/erts/emulator/beam/jit/arm/instr_bs.cpp
+++ b/erts/emulator/beam/jit/arm/instr_bs.cpp
@@ -1444,7 +1444,7 @@ void BeamModuleAssembler::emit_i_bs_create_bin(const ArgVal &Fail,
     Uint num_bits = 0;
     std::size_t n = args.size();
     std::vector<BscSegment> segments;
-    Label error = a.newLabel();
+    Label error;
     ArgVal Live = Live0;
     arm::Gp sizeReg;
 
@@ -1529,6 +1529,7 @@ void BeamModuleAssembler::emit_i_bs_create_bin(const ArgVal &Fail,
 
         a.b(past_error);
 
+        error = a.newLabel();
         a.bind(error);
         {
             /*
@@ -1779,13 +1780,14 @@ void BeamModuleAssembler::emit_i_bs_create_bin(const ArgVal &Fail,
             Uint error_info;
 
             comment("construct a binary segment");
-            emit_enter_runtime<Update::eReductions>(Live.getValue());
             if (seg.effectiveSize >= 0) {
                 /* The segment has a literal size. */
                 mov_imm(ARG3, seg.effectiveSize);
                 mov_arg(ARG2, seg.src);
                 a.mov(ARG1, c_p);
+                emit_enter_runtime<Update::eReductions>(Live.getValue());
                 runtime_call<3>(erts_new_bs_put_binary);
+                emit_leave_runtime<Update::eReductions>(Live.getValue());
                 error_info = beam_jit_update_bsc_reason_info(seg.error_info,
                                                              BSC_REASON_BADARG,
                                                              BSC_INFO_DEPENDS,
@@ -1796,7 +1798,9 @@ void BeamModuleAssembler::emit_i_bs_create_bin(const ArgVal &Fail,
                 a.mov(ARG3, seg.unit);
                 mov_arg(ARG2, seg.src);
                 a.mov(ARG1, c_p);
+                emit_enter_runtime<Update::eReductions>(Live.getValue());
                 runtime_call<3>(erts_new_bs_put_binary_all);
+                emit_leave_runtime<Update::eReductions>(Live.getValue());
                 error_info = beam_jit_update_bsc_reason_info(seg.error_info,
                                                              BSC_REASON_BADARG,
                                                              BSC_INFO_UNIT,
@@ -1814,13 +1818,14 @@ void BeamModuleAssembler::emit_i_bs_create_bin(const ArgVal &Fail,
                 }
                 mov_arg(ARG2, seg.src);
                 a.mov(ARG1, c_p);
+                emit_enter_runtime<Update::eReductions>(Live.getValue());
                 runtime_call<3>(erts_new_bs_put_binary);
+                emit_leave_runtime<Update::eReductions>(Live.getValue());
                 error_info = beam_jit_update_bsc_reason_info(seg.error_info,
                                                              BSC_REASON_BADARG,
                                                              BSC_INFO_DEPENDS,
                                                              BSC_VALUE_FVALUE);
             }
-            emit_leave_runtime<Update::eReductions>(Live.getValue());
             if (Fail.getValue() == 0) {
                 mov_imm(ARG4, error_info);
             }
-- 
2.31.1

Places

File 2241-Eliminate-crash-in-bs_create_bin-on-AArch64-built-wi.patch of Package erlang (Revision d62921b2b3be0a6375339d79b308a5a6)

Places