stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8164508: unexpected profiling mismatch in c1 generated code

Browse Source 
Made 8027631 first arg skip applicable to not inlined virtual callsite too.

Reviewed-by: kvn
This commit is contained in:
Jamsheed Mohammed C M 2016-09-09 06:11:54 -07:00
parent 6384a5d55d
commit 4ae6ce2b44
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
View File

@ -3210,14 +3210,14 @@ void LIRGenerator::profile_arguments(ProfileCall* x) {
Bytecodes::Code bc = x->method()->java_code_at_bci(bci); Bytecodes::Code bc = x->method()->java_code_at_bci(bci);
int start = 0; int start = 0;
int stop = data->is_CallTypeData() ? ((ciCallTypeData*)data)->number_of_arguments() : ((ciVirtualCallTypeData*)data)->number_of_arguments(); int stop = data->is_CallTypeData() ? ((ciCallTypeData*)data)->number_of_arguments() : ((ciVirtualCallTypeData*)data)->number_of_arguments();
if (x->inlined() && x->callee()->is_static() && Bytecodes::has_receiver(bc)) { if (x->callee()->is_loaded() && x->callee()->is_static() && Bytecodes::has_receiver(bc)) {
// first argument is not profiled at call (method handle invoke) // first argument is not profiled at call (method handle invoke)
assert(x->method()->raw_code_at_bci(bci) == Bytecodes::_invokehandle, "invokehandle expected"); assert(x->method()->raw_code_at_bci(bci) == Bytecodes::_invokehandle, "invokehandle expected");
start = 1; start = 1;
} }
ciSignature* callee_signature = x->callee()->signature(); ciSignature* callee_signature = x->callee()->signature();
// method handle call to virtual method // method handle call to virtual method
bool has_receiver = x->inlined() && !x->callee()->is_static() && !Bytecodes::has_receiver(bc); bool has_receiver = x->callee()->is_loaded() && !x->callee()->is_static() && !Bytecodes::has_receiver(bc);
ciSignatureStream callee_signature_stream(callee_signature, has_receiver ? x->callee()->holder() : NULL); ciSignatureStream callee_signature_stream(callee_signature, has_receiver ? x->callee()->holder() : NULL);
bool ignored_will_link; bool ignored_will_link;

3
hotspot/test/compiler/jsr292/NullConstantReceiver.java
View File

@ -23,10 +23,11 @@
/** /**
* @test * @test
* @bug 8059556 8158639 * @bug 8059556 8158639 8164508
* *
* @run main/othervm -Xbatch compiler.jsr292.NullConstantReceiver * @run main/othervm -Xbatch compiler.jsr292.NullConstantReceiver
* @run main/othervm -Xbatch -XX:CompileCommand=exclude,*::run compiler.jsr292.NullConstantReceiver * @run main/othervm -Xbatch -XX:CompileCommand=exclude,*::run compiler.jsr292.NullConstantReceiver
* @run main/othervm -Xbatch -XX:CompileCommand=compileonly,*::run compiler.jsr292.NullConstantReceiver
*/ */
package compiler.jsr292; package compiler.jsr292;