diff options
author | never <none@none> | 2011-05-12 10:29:02 -0700 |
---|---|---|
committer | never <none@none> | 2011-05-12 10:29:02 -0700 |
commit | d1e2af117a3a17cc5b5d178a8dda27dd2724f9af (patch) | |
tree | 0222e8d610dd90dd3483dd7b7714f64b334967c0 /src/cpu/x86 | |
parent | 24499ab16a5de2b57fd4252d7acc09546e271a33 (diff) |
7043461: VM crashes in void LinkResolver::runtime_resolve_virtual_method
Reviewed-by: kvn, coleenp
Diffstat (limited to 'src/cpu/x86')
-rw-r--r-- | src/cpu/x86/vm/cppInterpreter_x86.cpp | 17 | ||||
-rw-r--r-- | src/cpu/x86/vm/interpreter_x86_32.cpp | 20 | ||||
-rw-r--r-- | src/cpu/x86/vm/interpreter_x86_64.cpp | 14 | ||||
-rw-r--r-- | src/cpu/x86/vm/templateInterpreter_x86_32.cpp | 1 | ||||
-rw-r--r-- | src/cpu/x86/vm/templateInterpreter_x86_64.cpp | 1 |
5 files changed, 11 insertions, 42 deletions
diff --git a/src/cpu/x86/vm/cppInterpreter_x86.cpp b/src/cpu/x86/vm/cppInterpreter_x86.cpp index edacb282e..226c6cbc6 100644 --- a/src/cpu/x86/vm/cppInterpreter_x86.cpp +++ b/src/cpu/x86/vm/cppInterpreter_x86.cpp @@ -2339,14 +2339,15 @@ void BytecodeInterpreter::layout_interpreterState(interpreterState to_fill, } int AbstractInterpreter::layout_activation(methodOop method, - int tempcount, // - int popframe_extra_args, - int moncount, - int callee_param_count, - int callee_locals, - frame* caller, - frame* interpreter_frame, - bool is_top_frame) { + int tempcount, // + int popframe_extra_args, + int moncount, + int caller_actual_parameters, + int callee_param_count, + int callee_locals, + frame* caller, + frame* interpreter_frame, + bool is_top_frame) { assert(popframe_extra_args == 0, "FIX ME"); // NOTE this code must exactly mimic what InterpreterGenerator::generate_compute_interpreter_state() diff --git a/src/cpu/x86/vm/interpreter_x86_32.cpp b/src/cpu/x86/vm/interpreter_x86_32.cpp index cb2345a41..43a5a18a5 100644 --- a/src/cpu/x86/vm/interpreter_x86_32.cpp +++ b/src/cpu/x86/vm/interpreter_x86_32.cpp @@ -242,26 +242,6 @@ address InterpreterGenerator::generate_method_handle_entry(void) { return entry_point; } - -// This method tells the deoptimizer how big an interpreted frame must be: -int AbstractInterpreter::size_activation(methodOop method, - int tempcount, - int popframe_extra_args, - int moncount, - int callee_param_count, - int callee_locals, - bool is_top_frame) { - return layout_activation(method, - tempcount, - popframe_extra_args, - moncount, - callee_param_count, - callee_locals, - (frame*) NULL, - (frame*) NULL, - is_top_frame); -} - void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_array) { // This code is sort of the equivalent of C2IAdapter::setup_stack_frame back in diff --git a/src/cpu/x86/vm/interpreter_x86_64.cpp b/src/cpu/x86/vm/interpreter_x86_64.cpp index 3dbea5754..1c124c2f0 100644 --- a/src/cpu/x86/vm/interpreter_x86_64.cpp +++ b/src/cpu/x86/vm/interpreter_x86_64.cpp @@ -362,20 +362,6 @@ address InterpreterGenerator::generate_empty_entry(void) { } -// This method tells the deoptimizer how big an interpreted frame must be: -int AbstractInterpreter::size_activation(methodOop method, - int tempcount, - int popframe_extra_args, - int moncount, - int callee_param_count, - int callee_locals, - bool is_top_frame) { - return layout_activation(method, - tempcount, popframe_extra_args, moncount, - callee_param_count, callee_locals, - (frame*) NULL, (frame*) NULL, is_top_frame); -} - void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_array) { // This code is sort of the equivalent of C2IAdapter::setup_stack_frame back in diff --git a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp index a7222c265..6184bc393 100644 --- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp +++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp @@ -1589,6 +1589,7 @@ int AbstractInterpreter::layout_activation(methodOop method, int tempcount, int popframe_extra_args, int moncount, + int caller_actual_parameters, int callee_param_count, int callee_locals, frame* caller, diff --git a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp index 8d3740c70..80f08524b 100644 --- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp +++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp @@ -1603,6 +1603,7 @@ int AbstractInterpreter::layout_activation(methodOop method, int tempcount, int popframe_extra_args, int moncount, + int caller_actual_parameters, int callee_param_count, int callee_locals, frame* caller, |