Skip to content

erts: Fix use-before-initialization bug, and related errors #10359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
+15 −6
Merged

erts: Fix use-before-initialization bug, and related errors #10359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions erts/emulator/beam/jit/arm/beam_asm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ struct BeamAssembler : public BeamAssemblerCommon {
BeamAssembler() : BeamAssemblerCommon(a) {
Error err = code.attach(&a);
ERTS_ASSERT(!err && "Failed to attach codeHolder");

lateInit();
}

BeamAssembler(const std::string &log) : BeamAssembler() {
Expand Down
5 changes: 4 additions & 1 deletion erts/emulator/beam/jit/beam_jit_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,15 @@ BeamAssemblerCommon::BeamAssemblerCommon(BaseAssembler &assembler_)
8);
ERTS_ASSERT(!err && "Failed to create .rodata section");

code.setErrorHandler(this);
}

void BeamAssemblerCommon::lateInit() {
#ifdef DEBUG
assembler.addDiagnosticOptions(DiagnosticOptions::kValidateAssembler);
#endif
assembler.addEncodingOptions(EncodingOptions::kOptimizeForSize |
EncodingOptions::kOptimizedAlign);
code.setErrorHandler(this);
}

BeamAssemblerCommon::~BeamAssemblerCommon() {
Expand Down
2 changes: 2 additions & 0 deletions erts/emulator/beam/jit/beam_jit_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ class BeamAssemblerCommon : public ErrorHandler {
BeamAssemblerCommon(BaseAssembler &assembler);
~BeamAssemblerCommon();

void lateInit();

void codegen(JitAllocator *allocator,
const void **executable_ptr,
void **writable_ptr);
Expand Down
2 changes: 2 additions & 0 deletions erts/emulator/beam/jit/x86/beam_asm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ struct BeamAssembler : public BeamAssemblerCommon {
BeamAssembler() : BeamAssemblerCommon(a) {
Error err = code.attach(&a);
ERTS_ASSERT(!err && "Failed to attach codeHolder");

lateInit();
}

BeamAssembler(const std::string &log) : BeamAssembler() {
Expand Down
4 changes: 2 additions & 2 deletions erts/emulator/beam/jit/x86/instr_arith.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,13 +1063,13 @@ void BeamModuleAssembler::emit_i_mul_add(const ArgLabel &Fail,
p = ptr(RET, RET, 1, increment);
break;
case 4:
p = ptr(x86::Gp(), RET, 2, increment);
p = ptr_abs(increment, RET, 2);
break;
case 5:
p = ptr(RET, RET, 2, increment);
break;
case 8:
p = ptr(x86::Gp(), RET, 3, increment);
p = ptr_abs(increment, RET, 3);
break;
case 9:
p = ptr(RET, RET, 3, increment);
Expand Down
6 changes: 3 additions & 3 deletions erts/emulator/beam/jit/x86/instr_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ void BeamModuleAssembler::emit_is_binary(const ArgLabel &Fail,
a.mov(RET,
emit_boxed_val(boxed_ptr, offsetof(ErlHeapBits, size)));

a.mov(ARG2d, emit_boxed_val(boxed_ptr));
a.mov(ARG2d, emit_boxed_val(boxed_ptr, 0, sizeof(Uint32)));
a.cmp(ARG2d, imm(HEADER_SUB_BITS));
a.short_().jne(not_sub_bits);
{
Expand Down Expand Up @@ -1862,7 +1862,7 @@ void BeamModuleAssembler::emit_is_eq_exact(const ArgLabel &Fail,
a.cmp(emit_boxed_val(boxed_ptr), imm(HEADER_SUB_BITS));
} else {
a.mov(RETd, emit_boxed_val(boxed_ptr, 0, sizeof(Uint32)));
a.cmp(RETb, imm(HEADER_SUB_BITS));
a.cmp(RETd, imm(HEADER_SUB_BITS));
}
a.short_().jne(not_sub_bits);

Expand Down Expand Up @@ -2021,7 +2021,7 @@ void BeamModuleAssembler::emit_is_ne_exact(const ArgLabel &Fail,
a.cmp(emit_boxed_val(boxed_ptr), imm(HEADER_SUB_BITS));
} else {
a.mov(RETd, emit_boxed_val(boxed_ptr, 0, sizeof(Uint32)));
a.cmp(RETb, imm(HEADER_SUB_BITS));
a.cmp(RETd, imm(HEADER_SUB_BITS));
}
a.short_().jne(not_sub_bits);

Expand Down
Loading