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

8186478: [JVMCI] rename HotSpotResolvedJavaMethod#setNotInlineableOrCompileable

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Doug Simon 2017-11-06 12:17:59 +01:00
parent a31b9aa2f8
commit 67b21ffa1d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View File

@ -1000,7 +1000,7 @@ C2V_VMENTRY(jlong, getMaxCallTargetOffset, (JNIEnv*, jobject, jlong addr))
return -1;
C2V_END
C2V_VMENTRY(void, setNotInlineableOrCompileable,(JNIEnv *, jobject, jobject jvmci_method))
C2V_VMENTRY(void, setNotInlinableOrCompilable,(JNIEnv *, jobject, jobject jvmci_method))
methodHandle method = CompilerToVM::asMethod(jvmci_method);
method->set_not_c1_compilable();
method->set_not_c2_compilable();
@ -1820,7 +1820,7 @@ JNINativeMethod CompilerToVM::methods[] = {
{CC "getImplementor", CC "(" HS_RESOLVED_KLASS ")" HS_RESOLVED_KLASS, FN_PTR(getImplementor)},
{CC "getStackTraceElement", CC "(" HS_RESOLVED_METHOD "I)" STACK_TRACE_ELEMENT, FN_PTR(getStackTraceElement)},
{CC "methodIsIgnoredBySecurityStackWalk", CC "(" HS_RESOLVED_METHOD ")Z", FN_PTR(methodIsIgnoredBySecurityStackWalk)},
{CC "setNotInlineableOrCompileable", CC "(" HS_RESOLVED_METHOD ")V", FN_PTR(setNotInlineableOrCompileable)},
{CC "setNotInlinableOrCompilable", CC "(" HS_RESOLVED_METHOD ")V", FN_PTR(setNotInlinableOrCompilable)},
{CC "isCompilable", CC "(" HS_RESOLVED_METHOD ")Z", FN_PTR(isCompilable)},
{CC "hasNeverInlineDirective", CC "(" HS_RESOLVED_METHOD ")Z", FN_PTR(hasNeverInlineDirective)},
{CC "shouldInlineMethod", CC "(" HS_RESOLVED_METHOD ")Z", FN_PTR(shouldInlineMethod)},

2
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
View File

@ -470,7 +470,7 @@ final class CompilerToVM {
/**
* Sets flags on {@code method} indicating that it should never be inlined or compiled by the VM.
*/
native void setNotInlineableOrCompileable(HotSpotResolvedJavaMethodImpl method);
native void setNotInlinableOrCompilable(HotSpotResolvedJavaMethodImpl method);
/**
* Invalidates the profiling information for {@code method} and (re)initializes it such that

2
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java
View File

@ -59,7 +59,7 @@ public interface HotSpotResolvedJavaMethod extends ResolvedJavaMethod {
/**
* Sets flags on {@code method} indicating that it should never be inlined or compiled by the VM.
*/
void setNotInlineableOrCompileable();
void setNotInlinableOrCompilable();
/**
* Returns true if this method is one of the special methods that is ignored by security stack

4
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
View File

@ -320,8 +320,8 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
/**
* Sets flags on {@code method} indicating that it should never be inlined or compiled by the VM.
*/
public void setNotInlineableOrCompileable() {
compilerToVM().setNotInlineableOrCompileable(this);
public void setNotInlinableOrCompilable() {
compilerToVM().setNotInlinableOrCompilable(this);
}
/**

4
test/hotspot/jtreg/compiler/jvmci/common/patches/jdk.internal.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
View File

@ -224,8 +224,8 @@ public class CompilerToVMHelper {
return CTVM.getLocalVariableTableStart((HotSpotResolvedJavaMethodImpl)method);
}
public static void setNotInlineableOrCompileable(HotSpotResolvedJavaMethod method) {
CTVM.setNotInlineableOrCompileable((HotSpotResolvedJavaMethodImpl)method);
public static void setNotInlinableOrCompilable(HotSpotResolvedJavaMethod method) {
CTVM.setNotInlinableOrCompilable((HotSpotResolvedJavaMethodImpl)method);
}
public static void reprofile(HotSpotResolvedJavaMethod method) {

4
test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java
View File

@ -71,10 +71,10 @@ public class DoNotInlineOrCompileTest {
boolean hasNeverInlineDirective = CompilerToVMHelper.hasNeverInlineDirective(method);
Asserts.assertFalse(hasNeverInlineDirective, "Unexpected initial " +
"value of property 'hasNeverInlineDirective'");
CompilerToVMHelper.setNotInlineableOrCompileable(method);
CompilerToVMHelper.setNotInlinableOrCompilable(method);
hasNeverInlineDirective = CompilerToVMHelper.hasNeverInlineDirective(method);
Asserts.assertTrue(hasNeverInlineDirective, aMethod
+ " : hasNeverInlineDirective is false even after setNotInlineableOrCompileable'");
+ " : hasNeverInlineDirective is false even after setNotInlinableOrCompilable'");
}
private static List<Executable> createTestCases() {