stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8315698: Crash when comparing BasicType as int after JDK-8310577

Browse Source 
Reviewed-by: dlong, kvn, coleenp
This commit is contained in:
Daniel Jeliński 2023-09-07 04:52:18 +00:00
parent b05198a4f3
commit ab28300a42
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
View File

@ -326,6 +326,16 @@ address StubGenerator::generate_call_stub(address& return_address) {
__ jcc(Assembler::equal, is_float); __ jcc(Assembler::equal, is_float);
__ cmpl(c_rarg1, T_DOUBLE); __ cmpl(c_rarg1, T_DOUBLE);
__ jcc(Assembler::equal, is_double); __ jcc(Assembler::equal, is_double);
#ifdef ASSERT
// make sure the type is INT
{
Label L;
__ cmpl(c_rarg1, T_INT);
__ jcc(Assembler::equal, L);
__ stop("StubRoutines::call_stub: unexpected result type");
__ bind(L);
}
#endif
// handle T_INT case // handle T_INT case
__ movl(Address(c_rarg0, 0), rax); __ movl(Address(c_rarg0, 0), rax);

2
src/hotspot/share/runtime/stubRoutines.hpp
View File

@ -301,7 +301,7 @@ class StubRoutines: AllStatic {
typedef void (*CallStub)( typedef void (*CallStub)(
address link, address link,
intptr_t* result, intptr_t* result,
BasicType result_type, int result_type, /* BasicType on 4 bytes */
Method* method, Method* method,
address entry_point, address entry_point,
intptr_t* parameters, intptr_t* parameters,