File 1118-jit-Simplify-int_code_end-x86.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1118-jit-Simplify-int_code_end-x86.patch of Package erlang (Revision c854b829f459048c3356380f15e11c87)

Currently displaying revision c854b829f459048c3356380f15e11c87 , Show latest

From 1932429b2dd4c46108c87b12f28a5a7204dacfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Tue, 25 May 2021 13:43:06 +0200
Subject: [PATCH 18/20] jit: Simplify int_code_end (x86)

---
 erts/emulator/beam/jit/beam_jit_common.cpp     | 2 +-
 erts/emulator/beam/jit/x86/beam_asm.hpp        | 3 +++
 erts/emulator/beam/jit/x86/beam_asm_module.cpp | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/beam/jit/beam_jit_common.cpp b/erts/emulator/beam/jit/beam_jit_common.cpp
index 40fc99b94c..b8c1d073bf 100644
--- a/erts/emulator/beam/jit/beam_jit_common.cpp
+++ b/erts/emulator/beam/jit/beam_jit_common.cpp
@@ -282,7 +282,7 @@ void BeamModuleAssembler::codegen(JitAllocator *allocator,
             if (i + 1 < functions.size()) {
                 stop = getCode(functions[i + 1]);
             } else {
-                stop = getCode(labels.size());
+                stop = getCode(code_end);
             }
 
             ranges.push_back({.start = start, .stop = stop, .name = name});
diff --git a/erts/emulator/beam/jit/x86/beam_asm.hpp b/erts/emulator/beam/jit/x86/beam_asm.hpp
index a872064ba9..e8f5db8106 100644
--- a/erts/emulator/beam/jit/x86/beam_asm.hpp
+++ b/erts/emulator/beam/jit/x86/beam_asm.hpp
@@ -1035,6 +1035,9 @@ class BeamModuleAssembler : public BeamAssembler {
     /* The module's on_load function, if any. */
     Label on_load;
 
+    /* The end of the last function. */
+    Label code_end;
+
     Eterm mod;
 
     /* Save the last PC for an error. */
diff --git a/erts/emulator/beam/jit/x86/beam_asm_module.cpp b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
index 874e081b49..a2548276be 100644
--- a/erts/emulator/beam/jit/x86/beam_asm_module.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm_module.cpp
@@ -368,8 +368,8 @@ void BeamModuleAssembler::emit_on_load() {
 
 void BeamModuleAssembler::emit_int_code_end() {
     /* This label is used to figure out the end of the last function */
-    labels[labels.size() + 1] = a.newLabel();
-    a.bind(labels[labels.size()]);
+    code_end = a.newLabel();
+    a.bind(code_end);
 
     emit_nyi("int_code_end");
 }
-- 
2.26.2

Places

File 1118-jit-Simplify-int_code_end-x86.patch of Package erlang (Revision c854b829f459048c3356380f15e11c87)

Places