Mercurial > hg > release > icedtea7-forest-2.2 > hotspot

changeset 3446:1db5b993a0d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7118280: The gbyc00102 JCK7 test causes an assert in JVM 7.0 fastdebug mode Summary: Assert doesn't respect invokedynamic opcode Reviewed-by: dcubed, phh
author dsamersoff
date Thu, 29 Mar 2012 01:02:19 +0400
parents de5748cca211
children d5ff739e96c7
files src/share/vm/prims/jvmtiClassFileReconstituter.cpp
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Mon Mar 12 14:59:00 2012 -0700
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Thu Mar 29 01:02:19 2012 +0400
@@ -727,8 +727,11 @@
       case Bytecodes::_invokestatic    :  // fall through
       case Bytecodes::_invokedynamic   :  // fall through
       case Bytecodes::_invokeinterface :
-        assert(len == 3 || (code == Bytecodes::_invokeinterface && len ==5),
+        assert(len == 3 ||
+               (code == Bytecodes::_invokeinterface && len ==5) ||
+               (code == Bytecodes::_invokedynamic   && len ==5),
                "sanity check");
+
         int cpci = Bytes::get_native_u2(bcp+1);
         bool is_invokedynamic = (EnableInvokeDynamic && code == Bytecodes::_invokedynamic);
         if (is_invokedynamic)