Mercurial > hg > shark > hotspot

changeset 2511:3747a10c6e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
No more EnableMethodHandles
author Gary Benson <gbenson@redhat.com>
date Fri, 01 Apr 2011 11:09:36 +0100
parents d97b47ea5dbd
children a86f565f1a3a
files src/cpu/zero/vm/interpreter_zero.cpp src/share/vm/interpreter/bytecodeInterpreter.cpp
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/interpreter_zero.cpp	Fri Apr 01 11:06:30 2011 +0100
+++ b/src/cpu/zero/vm/interpreter_zero.cpp	Fri Apr 01 11:09:36 2011 +0100
@@ -71,9 +71,6 @@
 }
 
 address InterpreterGenerator::generate_method_handle_entry() {
-  if (!EnableMethodHandles)
-    return generate_entry((address) ShouldNotCallThisEntry());
-
   return generate_entry((address) CppInterpreter::method_handle_entry);
 }
 
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Apr 01 11:06:30 2011 +0100
+++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Apr 01 11:09:36 2011 +0100
@@ -2149,8 +2149,8 @@
 
       CASE(_fast_aldc_w):
       CASE(_fast_aldc): {
-        if (!EnableMethodHandles) {
-          // We should not encounter this bytecode if !EnableMethodHandles.
+        if (!EnableInvokeDynamic) {
+          // We should not encounter this bytecode if !EnableInvokeDynamic.
           // The verifier will stop it.  However, if we get past the verifier,
           // this will stop the thread in a reasonable way, without crashing the JVM.
           CALL_VM(InterpreterRuntime::throw_IncompatibleClassChangeError(THREAD),