Mercurial > hg > truffle

diff src/share/vm/classfile/classFileParser.cpp @ 1513:df736661d0c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jrose
date Tue, 11 May 2010 15:19:19 -0700
parents f03d0a26bf83 cd5dbf694d45
children c18cbe5936b8 086d73ccd6c0
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp	Mon May 10 14:58:38 2010 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Tue May 11 15:19:19 2010 -0700
@@ -1838,7 +1838,8 @@
     _has_vanilla_constructor = true;
   }
 
-  if (EnableMethodHandles && m->is_method_handle_invoke()) {
+  if (EnableMethodHandles && (m->is_method_handle_invoke() ||
+                              m->is_method_handle_adapter())) {
     THROW_MSG_(vmSymbols::java_lang_VirtualMachineError(),
                "Method handle invokers must be defined internally to the VM", nullHandle);
   }