Mercurial > hg > graal-jvmci-8

diff src/share/vm/classfile/verifier.cpp @ 1913:3b2dea75431e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6984311: JSR 292 needs optional bootstrap method parameters Summary: Allow CONSTANT_InvokeDynamic nodes to have any number of extra operands. Reviewed-by: twisti
author jrose
date Sat, 30 Oct 2010 13:08:23 -0700
parents 7f0fdccac34f
children 9752a6549f2e
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Sat Oct 30 12:19:07 2010 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Sat Oct 30 13:08:23 2010 -0700
@@ -1909,7 +1909,7 @@
   unsigned int types = (opcode == Bytecodes::_invokeinterface
                                 ? 1 << JVM_CONSTANT_InterfaceMethodref
                       : opcode == Bytecodes::_invokedynamic
-                                ? (1 << JVM_CONSTANT_NameAndType
+                                ? ((AllowTransitionalJSR292 ? 1 << JVM_CONSTANT_NameAndType : 0)
                                   |1 << JVM_CONSTANT_InvokeDynamic)
                                 : 1 << JVM_CONSTANT_Methodref);
   verify_cp_type(index, cp, types, CHECK_VERIFY(this));