From b74652b5f4424419b36888514730ac7550f42a6b Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 4 Nov 2024 14:37:10 +0000 Subject: [PATCH] 8343167: Unnecessary define checks in InterpreterRuntime after JDK-8199809 Reviewed-by: phh, coleenp --- src/hotspot/cpu/x86/interpreterRT_x86_32.cpp | 10 ---------- src/hotspot/cpu/x86/interpreterRT_x86_64.cpp | 2 -- 2 files changed, 12 deletions(-) diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp index a9b96c22427..139d3616f34 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp @@ -42,16 +42,6 @@ InterpreterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) { _masm = new MacroAssembler(buffer); -#ifdef AMD64 -#ifdef _WIN64 - _num_args = (method->is_static() ? 1 : 0); - _stack_offset = (Argument::n_int_register_parameters_c+1)* wordSize; // don't overwrite return address -#else - _num_int_args = (method->is_static() ? 1 : 0); - _num_fp_args = 0; - _stack_offset = wordSize; // don't overwrite return address -#endif // _WIN64 -#endif // AMD64 } void InterpreterRuntime::SignatureHandlerGenerator::pass_int() { diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp index 7e390564f4c..867dd1a282a 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp @@ -41,7 +41,6 @@ InterpreterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) { _masm = new MacroAssembler(buffer); -#ifdef AMD64 #ifdef _WIN64 _num_args = (method->is_static() ? 1 : 0); _stack_offset = (Argument::n_int_register_parameters_c+1)* wordSize; // don't overwrite return address @@ -50,7 +49,6 @@ InterpreterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(const m _num_fp_args = 0; _stack_offset = wordSize; // don't overwrite return address #endif // _WIN64 -#endif // AMD64 } Register InterpreterRuntime::SignatureHandlerGenerator::from() { return r14; }