Mercurial > hg > truffle

diff src/share/vm/classfile/verifier.cpp @ 1957:9752a6549f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author zgu
date Fri, 12 Nov 2010 09:37:13 -0500
parents 1070423b51f3 3b2dea75431e
children f95d63e2154a
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Fri Nov 05 09:32:08 2010 -0400
+++ b/src/share/vm/classfile/verifier.cpp	Fri Nov 12 09:37:13 2010 -0500
@@ -1908,7 +1908,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));