changeset 3345:d5ff739e96c7

Merge
author dsamersoff
date Wed, 28 Mar 2012 14:54:55 -0700
parents c1606f7a714c 1db5b993a0d8
children 1834c6835b75
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Fri Mar 23 15:28:24 2012 +0100
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Wed Mar 28 14:54:55 2012 -0700
@@ -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)