diff src/share/vm/classfile/verifier.cpp @ 1678:7f0fdccac34f

Merge
author apangin
date Sun, 25 Jul 2010 07:31:50 -0700
parents a5c9d63a187d 083fde3b838e
children 3b2dea75431e 1070423b51f3
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Tue Jul 20 08:41:42 2010 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Sun Jul 25 07:31:50 2010 -0700
@@ -1909,7 +1909,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));