1.1 --- a/src/share/vm/interpreter/abstractInterpreter.hpp Mon Jun 09 15:42:31 2014 -0700
1.2 +++ b/src/share/vm/interpreter/abstractInterpreter.hpp Tue Apr 01 09:36:49 2014 +0200
1.3 @@ -181,30 +181,16 @@
1.4 // Deoptimization should reexecute this bytecode
1.5 static bool bytecode_should_reexecute(Bytecodes::Code code);
1.6
1.7 - // share implementation of size_activation and layout_activation:
1.8 - static int size_activation(Method* method,
1.9 + // deoptimization support
1.10 + static int size_activation(int max_stack,
1.11 int temps,
1.12 - int popframe_args,
1.13 + int extra_args,
1.14 int monitors,
1.15 - int caller_actual_parameters,
1.16 int callee_params,
1.17 int callee_locals,
1.18 - bool is_top_frame,
1.19 - bool is_bottom_frame) {
1.20 - return layout_activation(method,
1.21 - temps,
1.22 - popframe_args,
1.23 - monitors,
1.24 - caller_actual_parameters,
1.25 - callee_params,
1.26 - callee_locals,
1.27 - (frame*)NULL,
1.28 - (frame*)NULL,
1.29 - is_top_frame,
1.30 - is_bottom_frame);
1.31 - }
1.32 + bool is_top_frame);
1.33
1.34 - static int layout_activation(Method* method,
1.35 + static void layout_activation(Method* method,
1.36 int temps,
1.37 int popframe_args,
1.38 int monitors,
