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

     1.1 --- a/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Nov 23 23:15:05 2016 -0800
     1.2 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Dec 02 10:39:04 2016 +0000
     1.3 @@ -3191,14 +3191,14 @@
     1.4        Bytecodes::Code bc = x->method()->java_code_at_bci(bci);
     1.5        int start = 0;
     1.6        int stop = data->is_CallTypeData() ? ((ciCallTypeData*)data)->number_of_arguments() : ((ciVirtualCallTypeData*)data)->number_of_arguments();
     1.7 -      if (x->inlined() && x->callee()->is_static() && Bytecodes::has_receiver(bc)) {
     1.8 +      if (x->callee()->is_loaded() && x->callee()->is_static() && Bytecodes::has_receiver(bc)) {
     1.9          // first argument is not profiled at call (method handle invoke)
    1.10          assert(x->method()->raw_code_at_bci(bci) == Bytecodes::_invokehandle, "invokehandle expected");
    1.11          start = 1;
    1.12        }
    1.13        ciSignature* callee_signature = x->callee()->signature();
    1.14        // method handle call to virtual method
    1.15 -      bool has_receiver = x->inlined() && !x->callee()->is_static() && !Bytecodes::has_receiver(bc);
    1.16 +      bool has_receiver = x->callee()->is_loaded() && !x->callee()->is_static() && !Bytecodes::has_receiver(bc);
    1.17        ciSignatureStream callee_signature_stream(callee_signature, has_receiver ? x->callee()->holder() : NULL);
    1.18  
    1.19        bool ignored_will_link;