src/share/vm/prims/jvmtiClassFileReconstituter.cpp

changeset 3626
ff29ce866f23
parent 3345
c01e115b095e
child 3670
f7c4174b33ba
     1.1 --- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Tue Feb 28 07:58:43 2012 -0800
     1.2 +++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Thu Mar 01 12:41:13 2012 +0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -727,8 +727,11 @@
    1.11        case Bytecodes::_invokestatic    :  // fall through
    1.12        case Bytecodes::_invokedynamic   :  // fall through
    1.13        case Bytecodes::_invokeinterface :
    1.14 -        assert(len == 3 || (code == Bytecodes::_invokeinterface && len ==5),
    1.15 +        assert(len == 3 ||
    1.16 +               (code == Bytecodes::_invokeinterface && len == 5) ||
    1.17 +               (code == Bytecodes::_invokedynamic   && len == 5),
    1.18                 "sanity check");
    1.19 +
    1.20          int cpci = Bytes::get_native_u2(bcp+1);
    1.21          bool is_invokedynamic = (EnableInvokeDynamic && code == Bytecodes::_invokedynamic);
    1.22          if (is_invokedynamic)

mercurial