File 0745-erts-Drive-by-fix-for-const-correctness-wa... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0745-erts-Drive-by-fix-for-const-correctness-warning.patch of Package erlang

From 9e05b78479e6af79073005496b0121a17a9670b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Sat, 27 May 2023 10:01:02 +0200
Subject: [PATCH 1/3] erts: Drive-by fix for const correctness warning

This warning only appeared with our 32-bit GCC builds for some
reason. Either way it's worth fixing.
---
 erts/emulator/beam/erl_term.c | 2 +-
 erts/emulator/beam/erl_term.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c
index 65f7d0f280..99b8fdb8f2 100644
--- a/erts/emulator/beam/erl_term.c
+++ b/erts/emulator/beam/erl_term.c
@@ -145,7 +145,7 @@ ET_DEFINE_CHECKED(struct erl_node_*,external_port_node,Wterm,is_external_port);
 ET_DEFINE_CHECKED(Uint32*,external_ref_data,Wterm,is_external_ref);
 ET_DEFINE_CHECKED(struct erl_node_*,external_ref_node,Eterm,is_external_ref);
 ET_DEFINE_CHECKED(Eterm*,export_val,Wterm,is_export);
-ET_DEFINE_CHECKED(Uint,external_thing_data_words,ExternalThing*,is_thing_ptr);
+ET_DEFINE_CHECKED(Uint,external_thing_data_words,const ExternalThing*,is_thing_ptr);
 
 ET_DEFINE_CHECKED(Eterm,make_cp,ErtsCodePtr,_is_legal_cp);
 ET_DEFINE_CHECKED(ErtsCodePtr,cp_val,Eterm,is_CP);
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index fa06ba5afe..d8f48bbef2 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -1168,7 +1168,7 @@ _ET_DECLARE_CHECKED(Eterm*,external_val,Wterm)
 
 #define _unchecked_external_thing_data_words(thing) \
     (_unchecked_thing_arityval((thing)->header) + (1 - EXTERNAL_THING_HEAD_SIZE))
-_ET_DECLARE_CHECKED(Uint,external_thing_data_words,ExternalThing*)
+_ET_DECLARE_CHECKED(Uint,external_thing_data_words,const ExternalThing*)
 #define external_thing_data_words(thing) _ET_APPLY(external_thing_data_words,(thing))
 
 #define _unchecked_external_data_words(x) \
-- 
2.35.3

Places

File 0745-erts-Drive-by-fix-for-const-correctness-warning.patch of Package erlang

Places