Mercurial > hg > graal-jvmci-8

diff src/share/vm/classfile/verifier.cpp @ 1922:5caa30ea147b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author iveresov
date Mon, 08 Nov 2010 14:33:48 -0800
parents 3b2dea75431e
children 9752a6549f2e
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Thu Nov 04 16:17:54 2010 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Mon Nov 08 14:33:48 2010 -0800
@@ -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));