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

Merge

Browse Source
This commit is contained in:
Roland Westrelin 2014-07-03 09:41:29 -07:00
commit b5b9945659
11 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/ci/ciConstantPoolCache.cpp
View File

@ -38,7 +38,7 @@ ciConstantPoolCache::ciConstantPoolCache(Arena* arena,
int expected_size) {
_elements =
new (arena) GrowableArray<void*>(arena, expected_size, 0, 0);
_keys = new (arena) GrowableArray<intptr_t>(arena, expected_size, 0, 0);
_keys = new (arena) GrowableArray<int>(arena, expected_size, 0, 0);
}
// ------------------------------------------------------------------

2
hotspot/src/share/vm/ci/ciConstantPoolCache.hpp
View File

@ -35,7 +35,7 @@
// Usage note: this klass has nothing to do with ConstantPoolCache*.
class ciConstantPoolCache : public ResourceObj {
private:
GrowableArray<intptr_t>* _keys;
GrowableArray<int>* _keys;
GrowableArray<void*>* _elements;
int find(int index);

28
hotspot/test/compiler/8009761/Test8009761.java
View File

@ -21,11 +21,7 @@
* questions.
*/
import com.sun.management.HotSpotDiagnosticMXBean;
import com.sun.management.VMOption;
import sun.hotspot.WhiteBox;
import sun.management.ManagementFactoryHelper;
import java.lang.reflect.Method;
/*
@ -40,6 +36,7 @@ import java.lang.reflect.Method;
public class Test8009761 {
private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
private static int COMP_LEVEL_SIMPLE = 1;
private static int COMP_LEVEL_FULL_OPTIMIZATION = 4;
private static Method m3 = null;
@ -236,7 +233,7 @@ public class Test8009761 {
static public void main(String[] args) {
// Make sure background compilation is disabled
if (backgroundCompilationEnabled()) {
if (WHITE_BOX.getBooleanVMFlag("BackgroundCompilation")) {
throw new RuntimeException("Background compilation enabled");
}
@ -256,7 +253,11 @@ public class Test8009761 {
c1 = count;
// Force the compilation of m3() that will inline m1()
WHITE_BOX.enqueueMethodForCompilation(m3, COMP_LEVEL_FULL_OPTIMIZATION);
if(!WHITE_BOX.enqueueMethodForCompilation(m3, COMP_LEVEL_FULL_OPTIMIZATION)) {
// C2 compiler not available, compile with C1
WHITE_BOX.enqueueMethodForCompilation(m3, COMP_LEVEL_SIMPLE);
}
// Because background compilation is disabled, method should now be compiled
if(!WHITE_BOX.isMethodCompiled(m3)) {
throw new RuntimeException(m3 + " not compiled");
@ -278,19 +279,4 @@ public class Test8009761 {
System.out.println("PASSED " + c1);
}
}
/**
* Checks if background compilation (-XX:+BackgroundCompilation) is enabled.
* @return True if background compilation is enabled, false otherwise
*/
private static boolean backgroundCompilationEnabled() {
HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
VMOption backgroundCompilation;
try {
backgroundCompilation = diagnostic.getVMOption("BackgroundCompilation");
} catch (IllegalArgumentException e) {
return false;
}
return Boolean.valueOf(backgroundCompilation.getValue());
}
}

1
hotspot/test/compiler/tiered/NonTieredLevelsTest.java
View File

@ -25,6 +25,7 @@ import java.util.function.IntPredicate;
/**
* @test NonTieredLevelsTest
* @ignore 8046268
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build NonTieredLevelsTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox

1
hotspot/test/compiler/tiered/TieredLevelsTest.java
View File

@ -23,6 +23,7 @@
/**
* @test TieredLevelsTest
* @ignore 8046268
* @library /testlibrary /testlibrary/whitebox /compiler/whitebox
* @build TieredLevelsTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox

1
hotspot/test/compiler/whitebox/ClearMethodStateTest.java
View File

@ -25,6 +25,7 @@ import java.util.function.Function;
/*
* @test ClearMethodStateTest
* @ignore 8046268
* @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build ClearMethodStateTest

1
hotspot/test/compiler/whitebox/DeoptimizeAllTest.java
View File

@ -23,6 +23,7 @@
/*
* @test DeoptimizeAllTest
* @ignore 8046268
* @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build DeoptimizeAllTest

1
hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java
View File

@ -23,6 +23,7 @@
/*
* @test DeoptimizeMethodTest
* @ignore 8046268
* @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build DeoptimizeMethodTest

1
hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java
View File

@ -23,6 +23,7 @@
/*
* @test EnqueueMethodForCompilationTest
* @ignore 8046268
* @bug 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build EnqueueMethodForCompilationTest

1
hotspot/test/compiler/whitebox/GetNMethodTest.java
View File

@ -26,6 +26,7 @@ import sun.hotspot.code.NMethod;
/*
* @test GetNMethodTest
* @ignore 8046268
* @bug 8038240
* @library /testlibrary /testlibrary/whitebox
* @build GetNMethodTest

1
hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java
View File

@ -23,6 +23,7 @@
/*
* @test MakeMethodNotCompilableTest
* @ignore 8046268
* @bug 8012322 8006683 8007288 8022832
* @library /testlibrary /testlibrary/whitebox
* @build MakeMethodNotCompilableTest