File 0724-Eliminate-unsafe-sharing-optimization-in-b... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0724-Eliminate-unsafe-sharing-optimization-in-beam_jump.patch of Package erlang (Revision a678cd3ed0e09b30f6d421d2e5c6d79e)

Currently displaying revision a678cd3ed0e09b30f6d421d2e5c6d79e , Show latest

From 16c2083c78a207f296918a831527e44b026c432d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 28 Apr 2023 13:19:04 +0200
Subject: [PATCH] Eliminate unsafe sharing optimization in beam_jump

Closes #7180
---
 lib/compiler/src/beam_jump.erl        | 1 +
 lib/compiler/test/beam_jump_SUITE.erl | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 90672bab7c..9ae5a33d74 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -464,6 +464,7 @@ add_scope([I|Is], Scope) ->
     [I|add_scope(Is, Scope)];
 add_scope([], _Scope) -> [].
 
+is_shareable([{badmatch,_}|_]) -> false;
 is_shareable([build_stacktrace|_]) -> false;
 is_shareable([{case_end,_}|_]) -> false;
 is_shareable([{'catch',_,_}|_]) -> false;
diff --git a/lib/compiler/test/beam_jump_SUITE.erl b/lib/compiler/test/beam_jump_SUITE.erl
index 713a1ea5ab..65fecd5b7c 100644
--- a/lib/compiler/test/beam_jump_SUITE.erl
+++ b/lib/compiler/test/beam_jump_SUITE.erl
@@ -82,6 +82,8 @@ ambiguous_catch_try_state(Config) ->
     {'EXIT',{{badmatch,0},_}} = (catch ambiguous_catch_try_state_2()),
     {'EXIT',{{badmatch,0},_}} = (catch ambiguous_catch_try_state_3()),
 
+    {'EXIT',{badarg,_}} = catch ambiguous_catch_try_state_4(),
+
     ok.
 
 river() -> song.
@@ -229,6 +231,12 @@ ambiguous_catch_try_state_3() ->
     end.
 
 
+ambiguous_catch_try_state_4() ->
+    0.0 = try binary_to_float(garbage_collect() orelse ((1.0 = tuple_to_list(ok)) -- ok))
+          after
+              ok
+          end.
+
 -record(message2, {id, p1}).
 -record(message3, {id, p1, p2}).
 
-- 
2.35.3

Places

File 0724-Eliminate-unsafe-sharing-optimization-in-beam_jump.patch of Package erlang (Revision a678cd3ed0e09b30f6d421d2e5c6d79e)

Places