File 1112-erts-Fix-FRAME_POINTER-macro-trap-on-unsup... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1112-erts-Fix-FRAME_POINTER-macro-trap-on-unsupported-con.patch of Package erlang (Revision 21c931d330ae21b94fbacaedefb38ac8)

Currently displaying revision 21c931d330ae21b94fbacaedefb38ac8 , Show latest

From aee5123b459d4658d1c9311b50685df7fc072f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Fri, 16 Apr 2021 13:47:38 +0200
Subject: [PATCH 12/20] erts: Fix FRAME_POINTER macro trap on unsupported
 configurations

---
 erts/emulator/beam/erl_process.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 44aaa72bf5..419234686f 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -961,9 +961,9 @@ typedef struct ErtsProcSysTaskQs_ ErtsProcSysTaskQs;
 #else
 /* We define this to a trapping lvalue when frame pointers are unsupported to
  * provoke crashes when used without checking `erts_frame_layout`. The checks
- * will not have a runtime cost in this case since said variable is hardcoded
- * to `ERTS_FRAME_LAYOUT_RA`. */
-#  define FRAME_POINTER(p)  (((volatile Eterm**)0xbadf00d)[0])
+ * will always be optimized out because the variable is hardcoded to
+ *  `ERTS_FRAME_LAYOUT_RA`. */
+#  define FRAME_POINTER(p)  (((Eterm ** volatile)0xbadf00d)[0])
 
 #  ifndef erts_frame_layout
 #    error "erts_frame_layout has not been hardcoded to ERTS_FRAME_LAYOUT_RA"
-- 
2.26.2

Places

File 1112-erts-Fix-FRAME_POINTER-macro-trap-on-unsupported-con.patch of Package erlang (Revision 21c931d330ae21b94fbacaedefb38ac8)

Places