archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8142968: Module System implementation

Browse source 
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282

Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Christian Tornqvist <christian.tornqvist@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: George Triantafillou <george.triantafillou@oracle.com>
Co-authored-by: Igor Ignatyev <igor.ignatyev@oracle.com>
Co-authored-by: Ioi Lam <ioi.lam@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jiangli Zhou <jiangli.zhou@oracle.com>
Co-authored-by: Markus Gronlund <markus.gronlund@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: acorn, ccheung, coleenp, ctornqvi, dholmes, dsimms, gtriantafill, iklam, jiangli, mgronlun, mseledtsov, cjplummer, sspitsyn, stefank, twisti, hseigel, lfoltan, alanb, mchung, dfazunen
This commit is contained in:
Alan Bateman 2016-03-17 19:04:01 +00:00
parent 007b0fa3db
commit f30fc1c88b
297 changed files with 15848 additions and 2302 deletions
Download patch file Download diff file Expand all files Collapse all files

149
hotspot/test/compiler/stable/TestStableFloat.java
View file

@ -26,64 +26,37 @@
/*
* @test TestStableFloat
* @summary tests on stable fields and arrays
* @library /testlibrary /test/lib
* @build TestStableFloat StableConfiguration sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassFileInstaller
* java/lang/invoke/StableConfiguration
* java/lang/invoke/TestStableFloat
* java/lang/invoke/TestStableFloat$FloatStable
* java/lang/invoke/TestStableFloat$StaticFloatStable
* java/lang/invoke/TestStableFloat$VolatileFloatStable
* java/lang/invoke/TestStableFloat$FloatArrayDim1
* java/lang/invoke/TestStableFloat$FloatArrayDim2
* java/lang/invoke/TestStableFloat$FloatArrayDim3
* java/lang/invoke/TestStableFloat$FloatArrayDim4
* java/lang/invoke/TestStableFloat$ObjectArrayLowerDim0
* java/lang/invoke/TestStableFloat$ObjectArrayLowerDim1
* java/lang/invoke/TestStableFloat$NestedStableField
* java/lang/invoke/TestStableFloat$NestedStableField$A
* java/lang/invoke/TestStableFloat$NestedStableField1
* java/lang/invoke/TestStableFloat$NestedStableField1$A
* java/lang/invoke/TestStableFloat$NestedStableField2
* java/lang/invoke/TestStableFloat$NestedStableField2$A
* java/lang/invoke/TestStableFloat$NestedStableField3
* java/lang/invoke/TestStableFloat$NestedStableField3$A
* java/lang/invoke/TestStableFloat$DefaultValue
* java/lang/invoke/TestStableFloat$DefaultStaticValue
* java/lang/invoke/TestStableFloat$ObjectArrayLowerDim2
* @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
* @build compiler.stable.TestStableFloat
*
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:-TieredCompilation
* -XX:+FoldStableValues
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* java.lang.invoke.TestStableFloat
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:-TieredCompilation
* -XX:-FoldStableValues
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* java.lang.invoke.TestStableFloat
*
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:+TieredCompilation -XX:TieredStopAtLevel=1
* -XX:+FoldStableValues
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* java.lang.invoke.TestStableFloat
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:+TieredCompilation -XX:TieredStopAtLevel=1
* -XX:-FoldStableValues
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* java.lang.invoke.TestStableFloat
* @run main/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* -XX:-TieredCompilation
* -XX:+FoldStableValues
* compiler.stable.TestStableFloat
* @run main/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* -XX:-TieredCompilation
* -XX:+FoldStableValues
* compiler.stable.TestStableFloat
*
* @run main/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* -XX:-TieredCompilation
* -XX:+FoldStableValues
* compiler.stable.TestStableFloat
* @run main/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
* -XX:-TieredCompilation
* -XX:+FoldStableValues
* compiler.stable.TestStableFloat
*/
package java.lang.invoke;
package compiler.stable;
import jdk.internal.vm.annotation.Stable;
import java.lang.reflect.InvocationTargetException;
public class TestStableFloat {
@ -127,7 +100,7 @@ public class TestStableFloat {
public static final DefaultValue c = new DefaultValue();
public static float get() { return c.v; }
public static void test() throws Exception {
float val1 = get();
float val1 = get();
c.v = 1.0F; float val2 = get();
assertEquals(val1, 0F);
assertEquals(val2, 1.0F);
@ -157,7 +130,7 @@ public class TestStableFloat {
public static final DefaultStaticValue c = new DefaultStaticValue();
public static float get() { return c.v; }
public static void test() throws Exception {
float val1 = get();
float val1 = get();
c.v = 1.0F; float val2 = get();
assertEquals(val1, 0F);
assertEquals(val2, 1.0F);
@ -207,24 +180,24 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1]; c.v[0] = 1.0F; float val1 = get();
c.v[0] = 2.0F; float val2 = get();
c.v[0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, (isServerWithStable ? 1.0F : 2.0F));
c.v = new float[1]; c.v[0] = 3.0F; float val3 = get();
assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 3.0F));
: 3.0F));
}
{
c.v = new float[20]; c.v[10] = 1.0F; float val1 = get1();
c.v[10] = 2.0F; float val2 = get1();
c.v[10] = 2.0F; float val2 = get1();
assertEquals(val1, 1.0F);
assertEquals(val2, (isServerWithStable ? 1.0F : 2.0F));
c.v = new float[20]; c.v[10] = 3.0F; float val3 = get1();
assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 3.0F));
: 3.0F));
}
{
@ -247,17 +220,17 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1][1]; c.v[0][0] = 1.0F; float val1 = get();
c.v[0][0] = 2.0F; float val2 = get();
c.v[0][0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, (isServerWithStable ? 1.0F : 2.0F));
c.v = new float[1][1]; c.v[0][0] = 3.0F; float val3 = get();
assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 3.0F));
: 3.0F));
c.v[0] = new float[1]; c.v[0][0] = 4.0F; float val4 = get();
assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 4.0F));
: 4.0F));
}
{
@ -287,21 +260,21 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1][1][1]; c.v[0][0][0] = 1.0F; float val1 = get();
c.v[0][0][0] = 2.0F; float val2 = get();
c.v[0][0][0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, (isServerWithStable ? 1.0F : 2.0F));
c.v = new float[1][1][1]; c.v[0][0][0] = 3.0F; float val3 = get();
assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 3.0F));
: 3.0F));
c.v[0] = new float[1][1]; c.v[0][0][0] = 4.0F; float val4 = get();
assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 4.0F));
: 4.0F));
c.v[0][0] = new float[1]; c.v[0][0][0] = 5.0F; float val5 = get();
assertEquals(val5, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 5.0F));
: 5.0F));
}
{
@ -338,25 +311,25 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1][1][1][1]; c.v[0][0][0][0] = 1.0F; float val1 = get();
c.v[0][0][0][0] = 2.0F; float val2 = get();
c.v[0][0][0][0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, (isServerWithStable ? 1.0F : 2.0F));
c.v = new float[1][1][1][1]; c.v[0][0][0][0] = 3.0F; float val3 = get();
assertEquals(val3, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 3.0F));
: 3.0F));
c.v[0] = new float[1][1][1]; c.v[0][0][0][0] = 4.0F; float val4 = get();
assertEquals(val4, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 4.0F));
: 4.0F));
c.v[0][0] = new float[1][1]; c.v[0][0][0][0] = 5.0F; float val5 = get();
assertEquals(val5, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 5.0F));
: 5.0F));
c.v[0][0][0] = new float[1]; c.v[0][0][0][0] = 6.0F; float val6 = get();
assertEquals(val6, (isStableEnabled ? (isServerWithStable ? 1.0F : 2.0F)
: 6.0F));
: 6.0F));
}
{
@ -397,7 +370,7 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1]; ((float[])c.v)[0] = 1.0F; float val1 = get();
((float[])c.v)[0] = 2.0F; float val2 = get();
((float[])c.v)[0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, 2.0F);
@ -424,7 +397,7 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1][1]; ((float[][])c.v)[0][0] = 1.0F; float val1 = get();
((float[][])c.v)[0][0] = 2.0F; float val2 = get();
((float[][])c.v)[0][0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, 2.0F);
@ -432,7 +405,7 @@ public class TestStableFloat {
{
c.v = new float[1][1]; c.v[0] = new float[0]; float[] val1 = get1();
c.v[0] = new float[0]; float[] val2 = get1();
c.v[0] = new float[0]; float[] val2 = get1();
assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
}
@ -460,7 +433,7 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new float[1][1][1]; ((float[][][])c.v)[0][0][0] = 1.0F; float val1 = get();
((float[][][])c.v)[0][0][0] = 2.0F; float val2 = get();
((float[][][])c.v)[0][0][0] = 2.0F; float val2 = get();
assertEquals(val1, 1.0F);
assertEquals(val2, 2.0F);
@ -468,14 +441,14 @@ public class TestStableFloat {
{
c.v = new float[1][1][1]; c.v[0][0] = new float[0]; float[] val1 = get1();
c.v[0][0] = new float[0]; float[] val2 = get1();
c.v[0][0] = new float[0]; float[] val2 = get1();
assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
}
{
c.v = new float[1][1][1]; c.v[0] = new float[0][0]; float[][] val1 = get2();
c.v[0] = new float[0][0]; float[][] val2 = get2();
c.v[0] = new float[0][0]; float[][] val2 = get2();
assertTrue((isServerWithStable ? (val1 == val2) : (val1 != val2)));
}
@ -505,7 +478,7 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new A(); c.v.a = 1.0F; A val1 = get();
c.v.a = 2.0F; A val2 = get();
c.v.a = 2.0F; A val2 = get();
assertEquals(val1.a, 2.0F);
assertEquals(val2.a, 2.0F);
@ -513,7 +486,7 @@ public class TestStableFloat {
{
c.v = new A(); c.v.a = 1.0F; float val1 = get1();
c.v.a = 2.0F; float val2 = get1();
c.v.a = 2.0F; float val2 = get1();
c.v = new A(); c.v.a = 3.0F; float val3 = get1();
assertEquals(val1, 1.0F);
@ -539,8 +512,8 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new A(); c.v.next = new A(); c.v.next.next = c.v;
c.v.a = 1.0F; c.v.next.a = 1.0F; A val1 = get();
c.v.a = 2.0F; c.v.next.a = 2.0F; A val2 = get();
c.v.a = 1.0F; c.v.next.a = 1.0F; A val1 = get();
c.v.a = 2.0F; c.v.next.a = 2.0F; A val2 = get();
assertEquals(val1.a, 2.0F);
assertEquals(val2.a, 2.0F);
@ -548,10 +521,10 @@ public class TestStableFloat {
{
c.v = new A(); c.v.next = c.v;
c.v.a = 1.0F; float val1 = get1();
c.v.a = 2.0F; float val2 = get1();
c.v.a = 1.0F; float val1 = get1();
c.v.a = 2.0F; float val2 = get1();
c.v = new A(); c.v.next = c.v;
c.v.a = 3.0F; float val3 = get1();
c.v.a = 3.0F; float val3 = get1();
assertEquals(val1, 1.0F);
assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
@ -577,8 +550,8 @@ public class TestStableFloat {
public static void test() throws Exception {
{
c.v = new A(); c.v.left = c.v.right = c.v;
c.v.a = 1.0F; float val1 = get(); float val2 = get1();
c.v.a = 2.0F; float val3 = get(); float val4 = get1();
c.v.a = 1.0F; float val1 = get(); float val2 = get1();
c.v.a = 2.0F; float val3 = get(); float val4 = get1();
assertEquals(val1, 1.0F);
assertEquals(val3, (isStableEnabled ? 1.0F : 2.0F));
@ -608,8 +581,8 @@ public class TestStableFloat {
{
A elem = new A();
c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
elem.a = 1.0F; float val1 = get(); float val2 = get1();
elem.a = 2.0F; float val3 = get(); float val4 = get1();
elem.a = 1.0F; float val1 = get(); float val2 = get1();
elem.a = 2.0F; float val3 = get(); float val4 = get1();
assertEquals(val1, 1.0F);
assertEquals(val3, (isServerWithStable ? 1.0F : 2.0F));