File 0160-debug-emulator-build-fix-assertions.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0160-debug-emulator-build-fix-assertions.patch of Package erlang (Revision 21c931d330ae21b94fbacaedefb38ac8)

Currently displaying revision 21c931d330ae21b94fbacaedefb38ac8 , Show latest

From 00eee21ea2770152d5e3ec756c5787a123d42a8b Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <maximfca@gmail.com>
Date: Mon, 24 May 2021 09:08:04 -0700
Subject: [PATCH] debug emulator build: fix assertions

codeSize can be zero legitimately.
Dual mapping is not enabled with Linux Perf support in dump/map mode.
---
 erts/emulator/beam/jit/x86/beam_asm.cpp      | 2 --
 erts/emulator/beam/jit/x86/beam_asm_perf.cpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/erts/emulator/beam/jit/x86/beam_asm.cpp b/erts/emulator/beam/jit/x86/beam_asm.cpp
index c4b89c5788..c4bfec3183 100644
--- a/erts/emulator/beam/jit/x86/beam_asm.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm.cpp
@@ -809,8 +809,6 @@ extern "C"
 
     void beamasm_purge_module(const void *native_module_exec,
                               void *native_module_rw) {
-        ASSERT(native_module_exec != native_module_rw);
-
         jit_allocator->release(const_cast<void *>(native_module_exec));
     }
 
diff --git a/erts/emulator/beam/jit/x86/beam_asm_perf.cpp b/erts/emulator/beam/jit/x86/beam_asm_perf.cpp
index 5f7c274195..bb2e1d8169 100644
--- a/erts/emulator/beam/jit/x86/beam_asm_perf.cpp
+++ b/erts/emulator/beam/jit/x86/beam_asm_perf.cpp
@@ -137,7 +137,7 @@ public:
         for (BeamAssembler::AsmRange &r : ranges) {
             size_t nameLen = r.name.size();
             ptrdiff_t codeSize = (char *)r.stop - (char *)r.start;
-            ASSERT(codeSize > 0);
+            ASSERT(codeSize >= 0);
             record.header.total_size = sizeof(record) + nameLen + 1 + codeSize;
             record.vma = (Uint64)r.start;
             record.code_addr = (Uint64)r.start;
-- 
2.26.2

Places

File 0160-debug-emulator-build-fix-assertions.patch of Package erlang (Revision 21c931d330ae21b94fbacaedefb38ac8)

Places