1.1 --- a/src/cpu/sparc/vm/interpreter_sparc.cpp Mon Jul 23 13:04:59 2012 -0700 1.2 +++ b/src/cpu/sparc/vm/interpreter_sparc.cpp Tue Jul 24 10:51:00 2012 -0700 1.3 @@ -255,17 +255,6 @@ 1.4 } 1.5 1.6 1.7 -// Method handle invoker 1.8 -// Dispatch a method of the form java.lang.invoke.MethodHandles::invoke(...) 1.9 -address InterpreterGenerator::generate_method_handle_entry(void) { 1.10 - if (!EnableInvokeDynamic) { 1.11 - return generate_abstract_entry(); 1.12 - } 1.13 - 1.14 - return MethodHandles::generate_method_handle_interpreter_entry(_masm); 1.15 -} 1.16 - 1.17 - 1.18 //---------------------------------------------------------------------------------------------------- 1.19 // Entry points & stack frame layout 1.20 // 1.21 @@ -395,7 +384,7 @@ 1.22 case Interpreter::empty : entry_point = ((InterpreterGenerator*)this)->generate_empty_entry(); break; 1.23 case Interpreter::accessor : entry_point = ((InterpreterGenerator*)this)->generate_accessor_entry(); break; 1.24 case Interpreter::abstract : entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry(); break; 1.25 - case Interpreter::method_handle : entry_point = ((InterpreterGenerator*)this)->generate_method_handle_entry(); break; 1.26 + 1.27 case Interpreter::java_lang_math_sin : break; 1.28 case Interpreter::java_lang_math_cos : break; 1.29 case Interpreter::java_lang_math_tan : break; 1.30 @@ -407,7 +396,9 @@ 1.31 case Interpreter::java_lang_math_exp : break; 1.32 case Interpreter::java_lang_ref_reference_get 1.33 : entry_point = ((InterpreterGenerator*)this)->generate_Reference_get_entry(); break; 1.34 - default : ShouldNotReachHere(); break; 1.35 + default: 1.36 + fatal(err_msg("unexpected method kind: %d", kind)); 1.37 + break; 1.38 } 1.39 1.40 if (entry_point) return entry_point;