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

7011839: JSR 292 turn on escape analysis when using invokedynamic

Browse Source 
Currently escape analysis is turned off when EnableInvokeDynamic is true.

Reviewed-by: jrose, kvn
This commit is contained in:
Christian Thalinger 2011-01-20 08:25:22 -08:00
parent 00e24ca7ca
commit 5e35df892d
2 changed files with 9 additions and 10 deletions
hotspot/src/share/vm
ci
bcEscapeAnalyzer.cpp
runtime
arguments.cpp

10
hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -233,6 +233,10 @@ void BCEscapeAnalyzer::invoke(StateInfo &state, Bytecodes::Code code, ciMethod*
// compute size of arguments
int arg_size = target->arg_size();
if (code == Bytecodes::_invokedynamic) {
assert(!target->is_static(), "receiver explicit in method");
arg_size--; // implicit, not really on stack
}
if (!target->is_loaded() && code == Bytecodes::_invokestatic) {
arg_size--;
}
@ -250,6 +254,10 @@ void BCEscapeAnalyzer::invoke(StateInfo &state, Bytecodes::Code code, ciMethod*
ArgumentMap arg = state._stack[i];
skip_callee = !is_argument(arg) || !is_arg_stack(arg) || (directly_recursive && arg.is_singleton(i - arg_base));
}
// For now we conservatively skip invokedynamic.
if (code == Bytecodes::_invokedynamic) {
skip_callee = true;
}
if (skip_callee) {
TRACE_BCEA(3, tty->print_cr("[EA] skipping method %s::%s", holder->name()->as_utf8(), target->name()->as_utf8()));
for (i = 0; i < arg_size; i++) {

9
hotspot/src/share/vm/runtime/arguments.cpp

@ -3029,15 +3029,6 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
}
ScavengeRootsInCode = 1;
}
#ifdef COMPILER2
if (EnableInvokeDynamic && DoEscapeAnalysis) {
// TODO: We need to find rules for invokedynamic and EA. For now,
// simply disable EA by default.
if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
DoEscapeAnalysis = false;
}
}
#endif
if (PrintGCDetails) {
// Turn on -verbose:gc options as well