Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Feb 21 09:48:52 2014 +0100
     1.2 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Apr 18 14:25:21 2014 +0200
     1.3 @@ -3186,8 +3186,8 @@
     1.4  #ifdef ASSERT
     1.5        Bytecodes::Code code = x->method()->raw_code_at_bci(x->bci_of_invoke());
     1.6        int n = x->nb_profiled_args();
     1.7 -      assert(MethodData::profile_parameters() && x->inlined() &&
     1.8 -             ((code == Bytecodes::_invokedynamic && n <= 1) || (code == Bytecodes::_invokehandle && n <= 2)),
     1.9 +      assert(MethodData::profile_parameters() && (MethodData::profile_arguments_jsr292_only() ||
    1.10 +                                                  (x->inlined() && ((code == Bytecodes::_invokedynamic && n <= 1) || (code == Bytecodes::_invokehandle && n <= 2)))),
    1.11               "only at JSR292 bytecodes");
    1.12  #endif
    1.13      }