Mercurial > hg > truffle

diff src/share/vm/classfile/verifier.cpp @ 1660:083fde3b838e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6964498: JSR 292 invokedynamic sites need local bootstrap methods Summary: Add JVM_CONSTANT_InvokeDynamic records to constant pool to determine per-instruction BSMs. Reviewed-by: twisti
author jrose
date Thu, 15 Jul 2010 18:40:45 -0700
parents 136b78722a08
children 7f0fdccac34f
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Thu Jul 15 08:54:48 2010 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Thu Jul 15 18:40:45 2010 -0700
@@ -1913,7 +1913,8 @@
   unsigned int types = (opcode == Bytecodes::_invokeinterface
                                 ? 1 << JVM_CONSTANT_InterfaceMethodref
                       : opcode == Bytecodes::_invokedynamic
-                                ? 1 << JVM_CONSTANT_NameAndType
+                                ? (1 << JVM_CONSTANT_NameAndType
+                                  |1 << JVM_CONSTANT_InvokeDynamic)
                                 : 1 << JVM_CONSTANT_Methodref);
   verify_cp_type(index, cp, types, CHECK_VERIFY(this));