< prev index next >
test/hotspot/jtreg/compiler/valhalla/valuetypes/TestNewAcmp.java
Print this page
*** 58,67 ****
--- 58,106 ----
* -XX:+WhiteBoxAPI -Xbatch -XX:+EnableValhalla -XX:TypeProfileLevel=222
* -XX:+AlwaysIncrementalInline
* -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
* -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
* compiler.valhalla.valuetypes.TestNewAcmp 2
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch
+ * -XX:+EnableValhalla -XX:TypeProfileLevel=222
+ * -XX:+UnlockExperimentalVMOptions -XX:ACmpOnValues=3
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
+ * compiler.valhalla.valuetypes.TestNewAcmp 0
+ * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -Xbatch -XX:+EnableValhalla -XX:TypeProfileLevel=222
+ * -XX:+UnlockExperimentalVMOptions -XX:ACmpOnValues=3
+ * -XX:+AlwaysIncrementalInline
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
+ * compiler.valhalla.valuetypes.TestNewAcmp 0
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch
+ * -XX:+EnableValhalla -XX:TypeProfileLevel=222
+ * -XX:+UnlockExperimentalVMOptions -XX:ACmpOnValues=3
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
+ * compiler.valhalla.valuetypes.TestNewAcmp 1
+ * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -Xbatch -XX:+EnableValhalla -XX:TypeProfileLevel=222
+ * -XX:+UnlockExperimentalVMOptions -XX:ACmpOnValues=3
+ * -XX:+AlwaysIncrementalInline
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
+ * compiler.valhalla.valuetypes.TestNewAcmp 1
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch
+ * -XX:+EnableValhalla -XX:TypeProfileLevel=222
+ * -XX:+UnlockExperimentalVMOptions -XX:ACmpOnValues=3
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
+ * compiler.valhalla.valuetypes.TestNewAcmp 2
+ * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -Xbatch -XX:+EnableValhalla -XX:TypeProfileLevel=222
+ * -XX:+UnlockExperimentalVMOptions -XX:ACmpOnValues=3
+ * -XX:+AlwaysIncrementalInline
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::test*
+ * -XX:CompileCommand=dontinline,compiler.valhalla.valuetypes.TestNewAcmp::cmp*
+ * compiler.valhalla.valuetypes.TestNewAcmp 2
*/
package compiler.valhalla.valuetypes;
import jdk.test.lib.Asserts;
*** 69,103 ****
import java.lang.annotation.RetentionPolicy;
import java.lang.invoke.*;
import java.lang.reflect.Method;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import sun.hotspot.WhiteBox;
interface MyInterface {
}
! value class MyValue implements MyInterface {
! final int x = 42;
! static MyValue createDefault() {
! return MyValue.default;
}
}
class MyObject implements MyInterface {
int x;
}
// Mark test methods that return always false
@Retention(RetentionPolicy.RUNTIME)
! @interface AlwaysFalse { }
// Mark test methods that return always true
@Retention(RetentionPolicy.RUNTIME)
! @interface AlwaysTrue { }
// Mark test methods that return false if the argument is null
@Retention(RetentionPolicy.RUNTIME)
@interface FalseIfNull { }
--- 108,163 ----
import java.lang.annotation.RetentionPolicy;
import java.lang.invoke.*;
import java.lang.reflect.Method;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
+ import java.util.Arrays;
import sun.hotspot.WhiteBox;
interface MyInterface {
}
! value class MyValue1 implements MyInterface {
! final int x = 0;
!
! static MyValue1 createDefault() {
! return MyValue1.default;
! }
! static MyValue1 setX(MyValue1 v, int x) {
! return __WithField(v.x, x);
! }
! }
!
! value class MyValue2 implements MyInterface {
! final int x = 0;
!
! static MyValue2 createDefault() {
! return MyValue2.default;
! }
!
! static MyValue2 setX(MyValue2 v, int x) {
! return __WithField(v.x, x);
}
}
class MyObject implements MyInterface {
int x;
}
// Mark test methods that return always false
@Retention(RetentionPolicy.RUNTIME)
! @interface AlwaysFalse {
! int[] valid_for() default {1, 2};
! }
// Mark test methods that return always true
@Retention(RetentionPolicy.RUNTIME)
! @interface AlwaysTrue {
! int[] valid_for() default {1, 2};
! }
// Mark test methods that return false if the argument is null
@Retention(RetentionPolicy.RUNTIME)
@interface FalseIfNull { }
*** 132,273 ****
@FalseIfNull
public boolean testEq01_6(Object u1, Object u2) {
return getNotNull(u1) == getNotNull(u2); // new acmp without null check
}
! public boolean testEq02_1(MyValue v1, MyValue v2) {
return get(v1) == (Object)v2; // only true if both null
}
! public boolean testEq02_2(MyValue v1, MyValue v2) {
return (Object)v1 == get(v2); // only true if both null
}
! public boolean testEq02_3(MyValue v1, MyValue v2) {
return get(v1) == get(v2); // only true if both null
}
! public boolean testEq03_1(MyValue v, Object u) {
return get(v) == u; // only true if both null
}
! public boolean testEq03_2(MyValue v, Object u) {
return (Object)v == get(u); // only true if both null
}
! public boolean testEq03_3(MyValue v, Object u) {
return get(v) == get(u); // only true if both null
}
! public boolean testEq04_1(Object u, MyValue v) {
return get(u) == (Object)v; // only true if both null
}
! public boolean testEq04_2(Object u, MyValue v) {
return u == get(v); // only true if both null
}
! public boolean testEq04_3(Object u, MyValue v) {
return get(u) == get(v); // only true if both null
}
! public boolean testEq05_1(MyObject o, MyValue v) {
return get(o) == (Object)v; // only true if both null
}
! public boolean testEq05_2(MyObject o, MyValue v) {
return o == get(v); // only true if both null
}
! public boolean testEq05_3(MyObject o, MyValue v) {
return get(o) == get(v); // only true if both null
}
! public boolean testEq06_1(MyValue v, MyObject o) {
return get(v) == o; // only true if both null
}
! public boolean testEq06_2(MyValue v, MyObject o) {
return (Object)v == get(o); // only true if both null
}
! public boolean testEq06_3(MyValue v, MyObject o) {
return get(v) == get(o); // only true if both null
}
@AlwaysFalse
! public boolean testEq07_1(MyValue v1, MyValue v2) {
return getNotNull(v1) == (Object)v2; // false
}
@AlwaysFalse
! public boolean testEq07_2(MyValue v1, MyValue v2) {
return (Object)v1 == getNotNull(v2); // false
}
@AlwaysFalse
! public boolean testEq07_3(MyValue v1, MyValue v2) {
return getNotNull(v1) == getNotNull(v2); // false
}
@AlwaysFalse
! public boolean testEq08_1(MyValue v, Object u) {
return getNotNull(v) == u; // false
}
@AlwaysFalse
! public boolean testEq08_2(MyValue v, Object u) {
return (Object)v == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq08_3(MyValue v, Object u) {
return getNotNull(v) == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq09_1(Object u, MyValue v) {
return getNotNull(u) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq09_2(Object u, MyValue v) {
return u == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq09_3(Object u, MyValue v) {
return getNotNull(u) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq10_1(MyObject o, MyValue v) {
return getNotNull(o) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq10_2(MyObject o, MyValue v) {
return o == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq10_3(MyObject o, MyValue v) {
return getNotNull(o) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq11_1(MyValue v, MyObject o) {
return getNotNull(v) == o; // false
}
@AlwaysFalse
! public boolean testEq11_2(MyValue v, MyObject o) {
return (Object)v == getNotNull(o); // false
}
@AlwaysFalse
! public boolean testEq11_3(MyValue v, MyObject o) {
return getNotNull(v) == getNotNull(o); // false
}
public boolean testEq12_1(MyObject o1, MyObject o2) {
return get(o1) == o2; // old acmp
--- 192,333 ----
@FalseIfNull
public boolean testEq01_6(Object u1, Object u2) {
return getNotNull(u1) == getNotNull(u2); // new acmp without null check
}
! public boolean testEq02_1(MyValue1 v1, MyValue1 v2) {
return get(v1) == (Object)v2; // only true if both null
}
! public boolean testEq02_2(MyValue1 v1, MyValue1 v2) {
return (Object)v1 == get(v2); // only true if both null
}
! public boolean testEq02_3(MyValue1 v1, MyValue1 v2) {
return get(v1) == get(v2); // only true if both null
}
! public boolean testEq03_1(MyValue1 v, Object u) {
return get(v) == u; // only true if both null
}
! public boolean testEq03_2(MyValue1 v, Object u) {
return (Object)v == get(u); // only true if both null
}
! public boolean testEq03_3(MyValue1 v, Object u) {
return get(v) == get(u); // only true if both null
}
! public boolean testEq04_1(Object u, MyValue1 v) {
return get(u) == (Object)v; // only true if both null
}
! public boolean testEq04_2(Object u, MyValue1 v) {
return u == get(v); // only true if both null
}
! public boolean testEq04_3(Object u, MyValue1 v) {
return get(u) == get(v); // only true if both null
}
! public boolean testEq05_1(MyObject o, MyValue1 v) {
return get(o) == (Object)v; // only true if both null
}
! public boolean testEq05_2(MyObject o, MyValue1 v) {
return o == get(v); // only true if both null
}
! public boolean testEq05_3(MyObject o, MyValue1 v) {
return get(o) == get(v); // only true if both null
}
! public boolean testEq06_1(MyValue1 v, MyObject o) {
return get(v) == o; // only true if both null
}
! public boolean testEq06_2(MyValue1 v, MyObject o) {
return (Object)v == get(o); // only true if both null
}
! public boolean testEq06_3(MyValue1 v, MyObject o) {
return get(v) == get(o); // only true if both null
}
@AlwaysFalse
! public boolean testEq07_1(MyValue1 v1, MyValue1 v2) {
return getNotNull(v1) == (Object)v2; // false
}
@AlwaysFalse
! public boolean testEq07_2(MyValue1 v1, MyValue1 v2) {
return (Object)v1 == getNotNull(v2); // false
}
@AlwaysFalse
! public boolean testEq07_3(MyValue1 v1, MyValue1 v2) {
return getNotNull(v1) == getNotNull(v2); // false
}
@AlwaysFalse
! public boolean testEq08_1(MyValue1 v, Object u) {
return getNotNull(v) == u; // false
}
@AlwaysFalse
! public boolean testEq08_2(MyValue1 v, Object u) {
return (Object)v == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq08_3(MyValue1 v, Object u) {
return getNotNull(v) == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq09_1(Object u, MyValue1 v) {
return getNotNull(u) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq09_2(Object u, MyValue1 v) {
return u == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq09_3(Object u, MyValue1 v) {
return getNotNull(u) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq10_1(MyObject o, MyValue1 v) {
return getNotNull(o) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq10_2(MyObject o, MyValue1 v) {
return o == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq10_3(MyObject o, MyValue1 v) {
return getNotNull(o) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq11_1(MyValue1 v, MyObject o) {
return getNotNull(v) == o; // false
}
@AlwaysFalse
! public boolean testEq11_2(MyValue1 v, MyObject o) {
return (Object)v == getNotNull(o); // false
}
@AlwaysFalse
! public boolean testEq11_3(MyValue1 v, MyObject o) {
return getNotNull(v) == getNotNull(o); // false
}
public boolean testEq12_1(MyObject o1, MyObject o2) {
return get(o1) == o2; // old acmp
*** 327,387 ****
public boolean testEq16_3(Object u, Object[] a) {
return get(u) == get(a); // old acmp
}
! public boolean testEq17_1(Object[] a, MyValue v) {
return get(a) == (Object)v; // only true if both null
}
! public boolean testEq17_2(Object[] a, MyValue v) {
return a == get(v); // only true if both null
}
! public boolean testEq17_3(Object[] a, MyValue v) {
return get(a) == get(v); // only true if both null
}
! public boolean testEq18_1(MyValue v, Object[] a) {
return get(v) == a; // only true if both null
}
! public boolean testEq18_2(MyValue v, Object[] a) {
return (Object)v == get(a); // only true if both null
}
! public boolean testEq18_3(MyValue v, Object[] a) {
return get(v) == get(a); // only true if both null
}
@AlwaysFalse
! public boolean testEq19_1(Object[] a, MyValue v) {
return getNotNull(a) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq19_2(Object[] a, MyValue v) {
return a == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq19_3(Object[] a, MyValue v) {
return getNotNull(a) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq20_1(MyValue v, Object[] a) {
return getNotNull(v) == a; // false
}
@AlwaysFalse
! public boolean testEq20_2(MyValue v, Object[] a) {
return (Object)v == getNotNull(a); // false
}
@AlwaysFalse
! public boolean testEq20_3(MyValue v, Object[] a) {
return getNotNull(v) == getNotNull(a); // false
}
public boolean testEq21_1(MyInterface u1, MyInterface u2) {
return get(u1) == u2; // new acmp
--- 387,447 ----
public boolean testEq16_3(Object u, Object[] a) {
return get(u) == get(a); // old acmp
}
! public boolean testEq17_1(Object[] a, MyValue1 v) {
return get(a) == (Object)v; // only true if both null
}
! public boolean testEq17_2(Object[] a, MyValue1 v) {
return a == get(v); // only true if both null
}
! public boolean testEq17_3(Object[] a, MyValue1 v) {
return get(a) == get(v); // only true if both null
}
! public boolean testEq18_1(MyValue1 v, Object[] a) {
return get(v) == a; // only true if both null
}
! public boolean testEq18_2(MyValue1 v, Object[] a) {
return (Object)v == get(a); // only true if both null
}
! public boolean testEq18_3(MyValue1 v, Object[] a) {
return get(v) == get(a); // only true if both null
}
@AlwaysFalse
! public boolean testEq19_1(Object[] a, MyValue1 v) {
return getNotNull(a) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq19_2(Object[] a, MyValue1 v) {
return a == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq19_3(Object[] a, MyValue1 v) {
return getNotNull(a) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq20_1(MyValue1 v, Object[] a) {
return getNotNull(v) == a; // false
}
@AlwaysFalse
! public boolean testEq20_2(MyValue1 v, Object[] a) {
return (Object)v == getNotNull(a); // false
}
@AlwaysFalse
! public boolean testEq20_3(MyValue1 v, Object[] a) {
return getNotNull(v) == getNotNull(a); // false
}
public boolean testEq21_1(MyInterface u1, MyInterface u2) {
return get(u1) == u2; // new acmp
*** 408,468 ****
@FalseIfNull
public boolean testEq21_6(MyInterface u1, MyInterface u2) {
return getNotNull(u1) == getNotNull(u2); // new acmp without null check
}
! public boolean testEq22_1(MyValue v, MyInterface u) {
return get(v) == u; // only true if both null
}
! public boolean testEq22_2(MyValue v, MyInterface u) {
return (Object)v == get(u); // only true if both null
}
! public boolean testEq22_3(MyValue v, MyInterface u) {
return get(v) == get(u); // only true if both null
}
! public boolean testEq23_1(MyInterface u, MyValue v) {
return get(u) == (Object)v; // only true if both null
}
! public boolean testEq23_2(MyInterface u, MyValue v) {
return u == get(v); // only true if both null
}
! public boolean testEq23_3(MyInterface u, MyValue v) {
return get(u) == get(v); // only true if both null
}
@AlwaysFalse
! public boolean testEq24_1(MyValue v, MyInterface u) {
return getNotNull(v) == u; // false
}
@AlwaysFalse
! public boolean testEq24_2(MyValue v, MyInterface u) {
return (Object)v == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq24_3(MyValue v, MyInterface u) {
return getNotNull(v) == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq25_1(MyInterface u, MyValue v) {
return getNotNull(u) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq25_2(MyInterface u, MyValue v) {
return u == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq25_3(MyInterface u, MyValue v) {
return getNotNull(u) == getNotNull(v); // false
}
public boolean testEq26_1(MyInterface u, MyObject o) {
return get(u) == o; // old acmp
--- 468,528 ----
@FalseIfNull
public boolean testEq21_6(MyInterface u1, MyInterface u2) {
return getNotNull(u1) == getNotNull(u2); // new acmp without null check
}
! public boolean testEq22_1(MyValue1 v, MyInterface u) {
return get(v) == u; // only true if both null
}
! public boolean testEq22_2(MyValue1 v, MyInterface u) {
return (Object)v == get(u); // only true if both null
}
! public boolean testEq22_3(MyValue1 v, MyInterface u) {
return get(v) == get(u); // only true if both null
}
! public boolean testEq23_1(MyInterface u, MyValue1 v) {
return get(u) == (Object)v; // only true if both null
}
! public boolean testEq23_2(MyInterface u, MyValue1 v) {
return u == get(v); // only true if both null
}
! public boolean testEq23_3(MyInterface u, MyValue1 v) {
return get(u) == get(v); // only true if both null
}
@AlwaysFalse
! public boolean testEq24_1(MyValue1 v, MyInterface u) {
return getNotNull(v) == u; // false
}
@AlwaysFalse
! public boolean testEq24_2(MyValue1 v, MyInterface u) {
return (Object)v == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq24_3(MyValue1 v, MyInterface u) {
return getNotNull(v) == getNotNull(u); // false
}
@AlwaysFalse
! public boolean testEq25_1(MyInterface u, MyValue1 v) {
return getNotNull(u) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq25_2(MyInterface u, MyValue1 v) {
return u == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq25_3(MyInterface u, MyValue1 v) {
return getNotNull(u) == getNotNull(v); // false
}
public boolean testEq26_1(MyInterface u, MyObject o) {
return get(u) == o; // old acmp
*** 510,605 ****
public boolean testEq29_3(MyInterface u, MyInterface[] a) {
return get(u) == get(a); // old acmp
}
! public boolean testEq30_1(MyInterface[] a, MyValue v) {
return get(a) == (Object)v; // only true if both null
}
! public boolean testEq30_2(MyInterface[] a, MyValue v) {
return a == get(v); // only true if both null
}
! public boolean testEq30_3(MyInterface[] a, MyValue v) {
return get(a) == get(v); // only true if both null
}
! public boolean testEq31_1(MyValue v, MyInterface[] a) {
return get(v) == a; // only true if both null
}
! public boolean testEq31_2(MyValue v, MyInterface[] a) {
return (Object)v == get(a); // only true if both null
}
! public boolean testEq31_3(MyValue v, MyInterface[] a) {
return get(v) == get(a); // only true if both null
}
@AlwaysFalse
! public boolean testEq32_1(MyInterface[] a, MyValue v) {
return getNotNull(a) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq32_2(MyInterface[] a, MyValue v) {
return a == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq32_3(MyInterface[] a, MyValue v) {
return getNotNull(a) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq33_1(MyValue v, MyInterface[] a) {
return getNotNull(v) == a; // false
}
@AlwaysFalse
! public boolean testEq33_2(MyValue v, MyInterface[] a) {
return (Object)v == getNotNull(a); // false
}
@AlwaysFalse
! public boolean testEq33_3(MyValue v, MyInterface[] a) {
return getNotNull(v) == getNotNull(a); // false
}
// Null tests
! public boolean testNull01_1(MyValue v) {
return (Object)v == null; // old acmp
}
! public boolean testNull01_2(MyValue v) {
return get(v) == null; // old acmp
}
! public boolean testNull01_3(MyValue v) {
return (Object)v == get((Object)null); // old acmp
}
! public boolean testNull01_4(MyValue v) {
return get(v) == get((Object)null); // old acmp
}
! public boolean testNull02_1(MyValue v) {
return null == (Object)v; // old acmp
}
! public boolean testNull02_2(MyValue v) {
return get((Object)null) == (Object)v; // old acmp
}
! public boolean testNull02_3(MyValue v) {
return null == get(v); // old acmp
}
! public boolean testNull02_4(MyValue v) {
return get((Object)null) == get(v); // old acmp
}
public boolean testNull03_1(Object u) {
return u == null; // old acmp
--- 570,665 ----
public boolean testEq29_3(MyInterface u, MyInterface[] a) {
return get(u) == get(a); // old acmp
}
! public boolean testEq30_1(MyInterface[] a, MyValue1 v) {
return get(a) == (Object)v; // only true if both null
}
! public boolean testEq30_2(MyInterface[] a, MyValue1 v) {
return a == get(v); // only true if both null
}
! public boolean testEq30_3(MyInterface[] a, MyValue1 v) {
return get(a) == get(v); // only true if both null
}
! public boolean testEq31_1(MyValue1 v, MyInterface[] a) {
return get(v) == a; // only true if both null
}
! public boolean testEq31_2(MyValue1 v, MyInterface[] a) {
return (Object)v == get(a); // only true if both null
}
! public boolean testEq31_3(MyValue1 v, MyInterface[] a) {
return get(v) == get(a); // only true if both null
}
@AlwaysFalse
! public boolean testEq32_1(MyInterface[] a, MyValue1 v) {
return getNotNull(a) == (Object)v; // false
}
@AlwaysFalse
! public boolean testEq32_2(MyInterface[] a, MyValue1 v) {
return a == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq32_3(MyInterface[] a, MyValue1 v) {
return getNotNull(a) == getNotNull(v); // false
}
@AlwaysFalse
! public boolean testEq33_1(MyValue1 v, MyInterface[] a) {
return getNotNull(v) == a; // false
}
@AlwaysFalse
! public boolean testEq33_2(MyValue1 v, MyInterface[] a) {
return (Object)v == getNotNull(a); // false
}
@AlwaysFalse
! public boolean testEq33_3(MyValue1 v, MyInterface[] a) {
return getNotNull(v) == getNotNull(a); // false
}
// Null tests
! public boolean testNull01_1(MyValue1 v) {
return (Object)v == null; // old acmp
}
! public boolean testNull01_2(MyValue1 v) {
return get(v) == null; // old acmp
}
! public boolean testNull01_3(MyValue1 v) {
return (Object)v == get((Object)null); // old acmp
}
! public boolean testNull01_4(MyValue1 v) {
return get(v) == get((Object)null); // old acmp
}
! public boolean testNull02_1(MyValue1 v) {
return null == (Object)v; // old acmp
}
! public boolean testNull02_2(MyValue1 v) {
return get((Object)null) == (Object)v; // old acmp
}
! public boolean testNull02_3(MyValue1 v) {
return null == get(v); // old acmp
}
! public boolean testNull02_4(MyValue1 v) {
return get((Object)null) == get(v); // old acmp
}
public boolean testNull03_1(Object u) {
return u == null; // old acmp
*** 724,865 ****
@TrueIfNull
public boolean testNotEq01_6(Object u1, Object u2) {
return getNotNull(u1) != getNotNull(u2); // new acmp without null check
}
! public boolean testNotEq02_1(MyValue v1, MyValue v2) {
return get(v1) != (Object)v2; // only false if both null
}
! public boolean testNotEq02_2(MyValue v1, MyValue v2) {
return (Object)v1 != get(v2); // only false if both null
}
! public boolean testNotEq02_3(MyValue v1, MyValue v2) {
return get(v1) != get(v2); // only false if both null
}
! public boolean testNotEq03_1(MyValue v, Object u) {
return get(v) != u; // only false if both null
}
! public boolean testNotEq03_2(MyValue v, Object u) {
return (Object)v != get(u); // only false if both null
}
! public boolean testNotEq03_3(MyValue v, Object u) {
return get(v) != get(u); // only false if both null
}
! public boolean testNotEq04_1(Object u, MyValue v) {
return get(u) != (Object)v; // only false if both null
}
! public boolean testNotEq04_2(Object u, MyValue v) {
return u != get(v); // only false if both null
}
! public boolean testNotEq04_3(Object u, MyValue v) {
return get(u) != get(v); // only false if both null
}
! public boolean testNotEq05_1(MyObject o, MyValue v) {
return get(o) != (Object)v; // only false if both null
}
! public boolean testNotEq05_2(MyObject o, MyValue v) {
return o != get(v); // only false if both null
}
! public boolean testNotEq05_3(MyObject o, MyValue v) {
return get(o) != get(v); // only false if both null
}
! public boolean testNotEq06_1(MyValue v, MyObject o) {
return get(v) != o; // only false if both null
}
! public boolean testNotEq06_2(MyValue v, MyObject o) {
return (Object)v != get(o); // only false if both null
}
! public boolean testNotEq06_3(MyValue v, MyObject o) {
return get(v) != get(o); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq07_1(MyValue v1, MyValue v2) {
return getNotNull(v1) != (Object)v2; // true
}
@AlwaysTrue
! public boolean testNotEq07_2(MyValue v1, MyValue v2) {
return (Object)v1 != getNotNull(v2); // true
}
@AlwaysTrue
! public boolean testNotEq07_3(MyValue v1, MyValue v2) {
return getNotNull(v1) != getNotNull(v2); // true
}
@AlwaysTrue
! public boolean testNotEq08_1(MyValue v, Object u) {
return getNotNull(v) != u; // true
}
@AlwaysTrue
! public boolean testNotEq08_2(MyValue v, Object u) {
return (Object)v != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq08_3(MyValue v, Object u) {
return getNotNull(v) != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq09_1(Object u, MyValue v) {
return getNotNull(u) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq09_2(Object u, MyValue v) {
return u != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq09_3(Object u, MyValue v) {
return getNotNull(u) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq10_1(MyObject o, MyValue v) {
return getNotNull(o) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq10_2(MyObject o, MyValue v) {
return o != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq10_3(MyObject o, MyValue v) {
return getNotNull(o) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq11_1(MyValue v, MyObject o) {
return getNotNull(v) != o; // true
}
@AlwaysTrue
! public boolean testNotEq11_2(MyValue v, MyObject o) {
return (Object)v != getNotNull(o); // true
}
@AlwaysTrue
! public boolean testNotEq11_3(MyValue v, MyObject o) {
return getNotNull(v) != getNotNull(o); // true
}
public boolean testNotEq12_1(MyObject o1, MyObject o2) {
return get(o1) != o2; // old acmp
--- 784,925 ----
@TrueIfNull
public boolean testNotEq01_6(Object u1, Object u2) {
return getNotNull(u1) != getNotNull(u2); // new acmp without null check
}
! public boolean testNotEq02_1(MyValue1 v1, MyValue1 v2) {
return get(v1) != (Object)v2; // only false if both null
}
! public boolean testNotEq02_2(MyValue1 v1, MyValue1 v2) {
return (Object)v1 != get(v2); // only false if both null
}
! public boolean testNotEq02_3(MyValue1 v1, MyValue1 v2) {
return get(v1) != get(v2); // only false if both null
}
! public boolean testNotEq03_1(MyValue1 v, Object u) {
return get(v) != u; // only false if both null
}
! public boolean testNotEq03_2(MyValue1 v, Object u) {
return (Object)v != get(u); // only false if both null
}
! public boolean testNotEq03_3(MyValue1 v, Object u) {
return get(v) != get(u); // only false if both null
}
! public boolean testNotEq04_1(Object u, MyValue1 v) {
return get(u) != (Object)v; // only false if both null
}
! public boolean testNotEq04_2(Object u, MyValue1 v) {
return u != get(v); // only false if both null
}
! public boolean testNotEq04_3(Object u, MyValue1 v) {
return get(u) != get(v); // only false if both null
}
! public boolean testNotEq05_1(MyObject o, MyValue1 v) {
return get(o) != (Object)v; // only false if both null
}
! public boolean testNotEq05_2(MyObject o, MyValue1 v) {
return o != get(v); // only false if both null
}
! public boolean testNotEq05_3(MyObject o, MyValue1 v) {
return get(o) != get(v); // only false if both null
}
! public boolean testNotEq06_1(MyValue1 v, MyObject o) {
return get(v) != o; // only false if both null
}
! public boolean testNotEq06_2(MyValue1 v, MyObject o) {
return (Object)v != get(o); // only false if both null
}
! public boolean testNotEq06_3(MyValue1 v, MyObject o) {
return get(v) != get(o); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq07_1(MyValue1 v1, MyValue1 v2) {
return getNotNull(v1) != (Object)v2; // true
}
@AlwaysTrue
! public boolean testNotEq07_2(MyValue1 v1, MyValue1 v2) {
return (Object)v1 != getNotNull(v2); // true
}
@AlwaysTrue
! public boolean testNotEq07_3(MyValue1 v1, MyValue1 v2) {
return getNotNull(v1) != getNotNull(v2); // true
}
@AlwaysTrue
! public boolean testNotEq08_1(MyValue1 v, Object u) {
return getNotNull(v) != u; // true
}
@AlwaysTrue
! public boolean testNotEq08_2(MyValue1 v, Object u) {
return (Object)v != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq08_3(MyValue1 v, Object u) {
return getNotNull(v) != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq09_1(Object u, MyValue1 v) {
return getNotNull(u) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq09_2(Object u, MyValue1 v) {
return u != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq09_3(Object u, MyValue1 v) {
return getNotNull(u) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq10_1(MyObject o, MyValue1 v) {
return getNotNull(o) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq10_2(MyObject o, MyValue1 v) {
return o != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq10_3(MyObject o, MyValue1 v) {
return getNotNull(o) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq11_1(MyValue1 v, MyObject o) {
return getNotNull(v) != o; // true
}
@AlwaysTrue
! public boolean testNotEq11_2(MyValue1 v, MyObject o) {
return (Object)v != getNotNull(o); // true
}
@AlwaysTrue
! public boolean testNotEq11_3(MyValue1 v, MyObject o) {
return getNotNull(v) != getNotNull(o); // true
}
public boolean testNotEq12_1(MyObject o1, MyObject o2) {
return get(o1) != o2; // old acmp
*** 919,979 ****
public boolean testNotEq16_3(Object u, Object[] a) {
return get(u) != get(a); // old acmp
}
! public boolean testNotEq17_1(Object[] a, MyValue v) {
return get(a) != (Object)v; // only false if both null
}
! public boolean testNotEq17_2(Object[] a, MyValue v) {
return a != get(v); // only false if both null
}
! public boolean testNotEq17_3(Object[] a, MyValue v) {
return get(a) != get(v); // only false if both null
}
! public boolean testNotEq18_1(MyValue v, Object[] a) {
return get(v) != a; // only false if both null
}
! public boolean testNotEq18_2(MyValue v, Object[] a) {
return (Object)v != get(a); // only false if both null
}
! public boolean testNotEq18_3(MyValue v, Object[] a) {
return get(v) != get(a); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq19_1(Object[] a, MyValue v) {
return getNotNull(a) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq19_2(Object[] a, MyValue v) {
return a != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq19_3(Object[] a, MyValue v) {
return getNotNull(a) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq20_1(MyValue v, Object[] a) {
return getNotNull(v) != a; // true
}
@AlwaysTrue
! public boolean testNotEq20_2(MyValue v, Object[] a) {
return (Object)v != getNotNull(a); // true
}
@AlwaysTrue
! public boolean testNotEq20_3(MyValue v, Object[] a) {
return getNotNull(v) != getNotNull(a); // true
}
public boolean testNotEq21_1(MyInterface u1, MyInterface u2) {
return get(u1) != u2; // new acmp
--- 979,1039 ----
public boolean testNotEq16_3(Object u, Object[] a) {
return get(u) != get(a); // old acmp
}
! public boolean testNotEq17_1(Object[] a, MyValue1 v) {
return get(a) != (Object)v; // only false if both null
}
! public boolean testNotEq17_2(Object[] a, MyValue1 v) {
return a != get(v); // only false if both null
}
! public boolean testNotEq17_3(Object[] a, MyValue1 v) {
return get(a) != get(v); // only false if both null
}
! public boolean testNotEq18_1(MyValue1 v, Object[] a) {
return get(v) != a; // only false if both null
}
! public boolean testNotEq18_2(MyValue1 v, Object[] a) {
return (Object)v != get(a); // only false if both null
}
! public boolean testNotEq18_3(MyValue1 v, Object[] a) {
return get(v) != get(a); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq19_1(Object[] a, MyValue1 v) {
return getNotNull(a) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq19_2(Object[] a, MyValue1 v) {
return a != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq19_3(Object[] a, MyValue1 v) {
return getNotNull(a) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq20_1(MyValue1 v, Object[] a) {
return getNotNull(v) != a; // true
}
@AlwaysTrue
! public boolean testNotEq20_2(MyValue1 v, Object[] a) {
return (Object)v != getNotNull(a); // true
}
@AlwaysTrue
! public boolean testNotEq20_3(MyValue1 v, Object[] a) {
return getNotNull(v) != getNotNull(a); // true
}
public boolean testNotEq21_1(MyInterface u1, MyInterface u2) {
return get(u1) != u2; // new acmp
*** 1000,1060 ****
@TrueIfNull
public boolean testNotEq21_6(MyInterface u1, MyInterface u2) {
return getNotNull(u1) != getNotNull(u2); // new acmp without null check
}
! public boolean testNotEq22_1(MyValue v, MyInterface u) {
return get(v) != u; // only false if both null
}
! public boolean testNotEq22_2(MyValue v, MyInterface u) {
return (Object)v != get(u); // only false if both null
}
! public boolean testNotEq22_3(MyValue v, MyInterface u) {
return get(v) != get(u); // only false if both null
}
! public boolean testNotEq23_1(MyInterface u, MyValue v) {
return get(u) != (Object)v; // only false if both null
}
! public boolean testNotEq23_2(MyInterface u, MyValue v) {
return u != get(v); // only false if both null
}
! public boolean testNotEq23_3(MyInterface u, MyValue v) {
return get(u) != get(v); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq24_1(MyValue v, MyInterface u) {
return getNotNull(v) != u; // true
}
@AlwaysTrue
! public boolean testNotEq24_2(MyValue v, MyInterface u) {
return (Object)v != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq24_3(MyValue v, MyInterface u) {
return getNotNull(v) != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq25_1(MyInterface u, MyValue v) {
return getNotNull(u) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq25_2(MyInterface u, MyValue v) {
return u != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq25_3(MyInterface u, MyValue v) {
return getNotNull(u) != getNotNull(v); // true
}
public boolean testNotEq26_1(MyInterface u, MyObject o) {
return get(u) != o; // old acmp
--- 1060,1120 ----
@TrueIfNull
public boolean testNotEq21_6(MyInterface u1, MyInterface u2) {
return getNotNull(u1) != getNotNull(u2); // new acmp without null check
}
! public boolean testNotEq22_1(MyValue1 v, MyInterface u) {
return get(v) != u; // only false if both null
}
! public boolean testNotEq22_2(MyValue1 v, MyInterface u) {
return (Object)v != get(u); // only false if both null
}
! public boolean testNotEq22_3(MyValue1 v, MyInterface u) {
return get(v) != get(u); // only false if both null
}
! public boolean testNotEq23_1(MyInterface u, MyValue1 v) {
return get(u) != (Object)v; // only false if both null
}
! public boolean testNotEq23_2(MyInterface u, MyValue1 v) {
return u != get(v); // only false if both null
}
! public boolean testNotEq23_3(MyInterface u, MyValue1 v) {
return get(u) != get(v); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq24_1(MyValue1 v, MyInterface u) {
return getNotNull(v) != u; // true
}
@AlwaysTrue
! public boolean testNotEq24_2(MyValue1 v, MyInterface u) {
return (Object)v != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq24_3(MyValue1 v, MyInterface u) {
return getNotNull(v) != getNotNull(u); // true
}
@AlwaysTrue
! public boolean testNotEq25_1(MyInterface u, MyValue1 v) {
return getNotNull(u) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq25_2(MyInterface u, MyValue1 v) {
return u != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq25_3(MyInterface u, MyValue1 v) {
return getNotNull(u) != getNotNull(v); // true
}
public boolean testNotEq26_1(MyInterface u, MyObject o) {
return get(u) != o; // old acmp
*** 1102,1196 ****
public boolean testNotEq29_3(MyInterface u, MyInterface[] a) {
return get(u) != get(a); // old acmp
}
! public boolean testNotEq30_1(MyInterface[] a, MyValue v) {
return get(a) != (Object)v; // only false if both null
}
! public boolean testNotEq30_2(MyInterface[] a, MyValue v) {
return a != get(v); // only false if both null
}
! public boolean testNotEq30_3(MyInterface[] a, MyValue v) {
return get(a) != get(v); // only false if both null
}
! public boolean testNotEq31_1(MyValue v, MyInterface[] a) {
return get(v) != a; // only false if both null
}
! public boolean testNotEq31_2(MyValue v, MyInterface[] a) {
return (Object)v != get(a); // only false if both null
}
! public boolean testNotEq31_3(MyValue v, MyInterface[] a) {
return get(v) != get(a); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq32_1(MyInterface[] a, MyValue v) {
return getNotNull(a) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq32_2(MyInterface[] a, MyValue v) {
return a != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq32_3(MyInterface[] a, MyValue v) {
return getNotNull(a) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq33_1(MyValue v, MyInterface[] a) {
return getNotNull(v) != a; // true
}
@AlwaysTrue
! public boolean testNotEq33_2(MyValue v, MyInterface[] a) {
return (Object)v != getNotNull(a); // true
}
@AlwaysTrue
! public boolean testNotEq33_3(MyValue v, MyInterface[] a) {
return getNotNull(v) != getNotNull(a); // true
}
// Null tests
! public boolean testNotNull01_1(MyValue v) {
return (Object)v != null; // old acmp
}
! public boolean testNotNull01_2(MyValue v) {
return get(v) != null; // old acmp
}
! public boolean testNotNull01_3(MyValue v) {
return (Object)v != get((Object)null); // old acmp
}
! public boolean testNotNull01_4(MyValue v) {
return get(v) != get((Object)null); // old acmp
}
! public boolean testNotNull02_1(MyValue v) {
return null != (Object)v; // old acmp
}
! public boolean testNotNull02_2(MyValue v) {
return get((Object)null) != (Object)v; // old acmp
}
! public boolean testNotNull02_3(MyValue v) {
return null != get(v); // old acmp
}
! public boolean testNotNull02_4(MyValue v) {
return get((Object)null) != get(v); // old acmp
}
public boolean testNotNull03_1(Object u) {
return u != null; // old acmp
--- 1162,1256 ----
public boolean testNotEq29_3(MyInterface u, MyInterface[] a) {
return get(u) != get(a); // old acmp
}
! public boolean testNotEq30_1(MyInterface[] a, MyValue1 v) {
return get(a) != (Object)v; // only false if both null
}
! public boolean testNotEq30_2(MyInterface[] a, MyValue1 v) {
return a != get(v); // only false if both null
}
! public boolean testNotEq30_3(MyInterface[] a, MyValue1 v) {
return get(a) != get(v); // only false if both null
}
! public boolean testNotEq31_1(MyValue1 v, MyInterface[] a) {
return get(v) != a; // only false if both null
}
! public boolean testNotEq31_2(MyValue1 v, MyInterface[] a) {
return (Object)v != get(a); // only false if both null
}
! public boolean testNotEq31_3(MyValue1 v, MyInterface[] a) {
return get(v) != get(a); // only false if both null
}
@AlwaysTrue
! public boolean testNotEq32_1(MyInterface[] a, MyValue1 v) {
return getNotNull(a) != (Object)v; // true
}
@AlwaysTrue
! public boolean testNotEq32_2(MyInterface[] a, MyValue1 v) {
return a != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq32_3(MyInterface[] a, MyValue1 v) {
return getNotNull(a) != getNotNull(v); // true
}
@AlwaysTrue
! public boolean testNotEq33_1(MyValue1 v, MyInterface[] a) {
return getNotNull(v) != a; // true
}
@AlwaysTrue
! public boolean testNotEq33_2(MyValue1 v, MyInterface[] a) {
return (Object)v != getNotNull(a); // true
}
@AlwaysTrue
! public boolean testNotEq33_3(MyValue1 v, MyInterface[] a) {
return getNotNull(v) != getNotNull(a); // true
}
// Null tests
! public boolean testNotNull01_1(MyValue1 v) {
return (Object)v != null; // old acmp
}
! public boolean testNotNull01_2(MyValue1 v) {
return get(v) != null; // old acmp
}
! public boolean testNotNull01_3(MyValue1 v) {
return (Object)v != get((Object)null); // old acmp
}
! public boolean testNotNull01_4(MyValue1 v) {
return get(v) != get((Object)null); // old acmp
}
! public boolean testNotNull02_1(MyValue1 v) {
return null != (Object)v; // old acmp
}
! public boolean testNotNull02_2(MyValue1 v) {
return get((Object)null) != (Object)v; // old acmp
}
! public boolean testNotNull02_3(MyValue1 v) {
return null != get(v); // old acmp
}
! public boolean testNotNull02_4(MyValue1 v) {
return get((Object)null) != get(v); // old acmp
}
public boolean testNotNull03_1(Object u) {
return u != null; // old acmp
*** 1296,1319 ****
public Object getNotNull(Object u) {
return (u != null) ? u : new Object();
}
! public Object get(MyValue v) {
return v;
}
! public Object getNotNull(MyValue v) {
! return ((Object)v != null) ? v : MyValue.createDefault();
}
public Object get(MyObject o) {
return o;
}
public Object getNotNull(MyObject o) {
! return (o != null) ? o : MyValue.createDefault();
}
public Object get(Object[] a) {
return a;
}
--- 1356,1379 ----
public Object getNotNull(Object u) {
return (u != null) ? u : new Object();
}
! public Object get(MyValue1 v) {
return v;
}
! public Object getNotNull(MyValue1 v) {
! return ((Object)v != null) ? v : MyValue1.createDefault();
}
public Object get(MyObject o) {
return o;
}
public Object getNotNull(MyObject o) {
! return (o != null) ? o : MyValue1.createDefault();
}
public Object get(Object[] a) {
return a;
}
*** 1329,1343 ****
public boolean falseIfNull(Method m) {
return m.isAnnotationPresent(FalseIfNull.class);
}
public boolean alwaysTrue(Method m) {
! return m.isAnnotationPresent(AlwaysTrue.class);
}
public boolean alwaysFalse(Method m) {
! return m.isAnnotationPresent(AlwaysFalse.class);
}
public boolean isNegated(Method m) {
return m.getName().startsWith("testNot");
}
--- 1389,1405 ----
public boolean falseIfNull(Method m) {
return m.isAnnotationPresent(FalseIfNull.class);
}
public boolean alwaysTrue(Method m) {
! return m.isAnnotationPresent(AlwaysTrue.class) &&
! Arrays.asList(((AlwaysTrue)m.getAnnotation(AlwaysTrue.class)).valid_for()).contains(ACmpOnValues);
}
public boolean alwaysFalse(Method m) {
! return m.isAnnotationPresent(AlwaysFalse.class) &&
! Arrays.asList(((AlwaysFalse)m.getAnnotation(AlwaysFalse.class)).valid_for()).contains(ACmpOnValues);
}
public boolean isNegated(Method m) {
return m.getName().startsWith("testNot");
}
*** 1383,1415 ****
return a != a;
}
protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
protected static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
! public void runTest(Method m, Object[] args, int warmup, int nullMode) throws Exception {
Class<?>[] parameterTypes = m.getParameterTypes();
int parameterCount = parameterTypes.length;
// Nullness mode for first argument
// 0: default, 1: never null, 2: always null
int start = (nullMode != 1) ? 0 : 1;
int end = (nullMode != 2) ? args.length : 1;
for (int i = start; i < end; ++i) {
if (args[i] != null && !parameterTypes[0].isInstance(args[i])) {
continue;
}
! if (args[i] == null && parameterTypes[0] == MyValue.class.asValueType()) {
continue;
}
if (parameterCount == 1) {
// Null checks
System.out.print("Testing " + m.getName() + "(" + args[i] + ")");
// Avoid acmp in the computation of the expected result!
boolean expected = isNegated(m) ? (i != 0) : (i == 0);
for (int run = 0; run < warmup; ++run) {
Boolean result = (Boolean)m.invoke(this, args[i]);
! if (result != expected) {
System.out.println(" = " + result);
throw new RuntimeException("Test failed: should return " + expected);
}
}
System.out.println(" = " + expected);
--- 1445,1478 ----
return a != a;
}
protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
protected static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
+ protected static final long ACmpOnValues = (Long)WHITE_BOX.getVMFlag("ACmpOnValues");
! public void runTest(Method m, Object[] args, int warmup, int nullMode, boolean[][] equalities) throws Exception {
Class<?>[] parameterTypes = m.getParameterTypes();
int parameterCount = parameterTypes.length;
// Nullness mode for first argument
// 0: default, 1: never null, 2: always null
int start = (nullMode != 1) ? 0 : 1;
int end = (nullMode != 2) ? args.length : 1;
for (int i = start; i < end; ++i) {
if (args[i] != null && !parameterTypes[0].isInstance(args[i])) {
continue;
}
! if (args[i] == null && parameterTypes[0] == MyValue1.class.asValueType()) {
continue;
}
if (parameterCount == 1) {
// Null checks
System.out.print("Testing " + m.getName() + "(" + args[i] + ")");
// Avoid acmp in the computation of the expected result!
boolean expected = isNegated(m) ? (i != 0) : (i == 0);
for (int run = 0; run < warmup; ++run) {
Boolean result = (Boolean)m.invoke(this, args[i]);
! if (result != expected && WHITE_BOX.isMethodCompiled(m, false)) {
System.out.println(" = " + result);
throw new RuntimeException("Test failed: should return " + expected);
}
}
System.out.println(" = " + expected);
*** 1417,1437 ****
// Equality checks
for (int j = 0; j < args.length; ++j) {
if (args[j] != null && !parameterTypes[1].isInstance(args[j])) {
continue;
}
! if (args[j] == null && parameterTypes[1] == MyValue.class.asValueType()) {
continue;
}
System.out.print("Testing " + m.getName() + "(" + args[i] + ", " + args[j] + ")");
// Avoid acmp in the computation of the expected result!
! boolean equal = (i == j) && (i != 3);
equal = isNegated(m) ? !equal : equal;
boolean expected = alwaysTrue(m) || ((i == 0 || j == 0) && trueIfNull(m)) || (!alwaysFalse(m) && equal && !(i == 0 && falseIfNull(m)));
for (int run = 0; run < warmup; ++run) {
Boolean result = (Boolean)m.invoke(this, args[i], args[j]);
! if (result != expected) {
System.out.println(" = " + result);
throw new RuntimeException("Test failed: should return " + expected);
}
}
System.out.println(" = " + expected);
--- 1480,1500 ----
// Equality checks
for (int j = 0; j < args.length; ++j) {
if (args[j] != null && !parameterTypes[1].isInstance(args[j])) {
continue;
}
! if (args[j] == null && parameterTypes[1] == MyValue1.class.asValueType()) {
continue;
}
System.out.print("Testing " + m.getName() + "(" + args[i] + ", " + args[j] + ")");
// Avoid acmp in the computation of the expected result!
! boolean equal = equalities[i][j];
equal = isNegated(m) ? !equal : equal;
boolean expected = alwaysTrue(m) || ((i == 0 || j == 0) && trueIfNull(m)) || (!alwaysFalse(m) && equal && !(i == 0 && falseIfNull(m)));
for (int run = 0; run < warmup; ++run) {
Boolean result = (Boolean)m.invoke(this, args[i], args[j]);
! if (result != expected && WHITE_BOX.isMethodCompiled(m, false) && warmup == 1) {
System.out.println(" = " + result);
throw new RuntimeException("Test failed: should return " + expected);
}
}
System.out.println(" = " + expected);
*** 1440,1467 ****
}
}
public void run(int nullMode) throws Exception {
// Prepare test arguments
! Object[] args = new Object[6];
! args[0] = null;
! args[1] = new Object();
! args[2] = new MyObject();
! args[3] = MyValue.createDefault();
! args[4] = new Object[10];
! args[5] = new MyObject[10];
// Run tests
for (Method m : getClass().getMethods()) {
if (m.getName().startsWith("test")) {
// Do some warmup runs
! runTest(m, args, 1000, nullMode);
// Make sure method is compiled
WHITE_BOX.enqueueMethodForCompilation(m, COMP_LEVEL_FULL_OPTIMIZATION);
Asserts.assertTrue(WHITE_BOX.isMethodCompiled(m, false), m + " not compiled");
// Run again to verify correctness of compiled code
! runTest(m, args, 1, nullMode);
}
}
for (int i = 0; i < 10_000; ++i) {
Asserts.assertTrue(cmpAlwaysEqual1(args[1], args[1]));
--- 1503,1542 ----
}
}
public void run(int nullMode) throws Exception {
// Prepare test arguments
! Object[] args = { null,
! new Object(),
! new MyObject(),
! MyValue1.setX(MyValue1.createDefault(), 42),
! new Object[10],
! new MyObject[10],
! MyValue1.setX(MyValue1.createDefault(), 0x42),
! MyValue1.setX(MyValue1.createDefault(), 42),
! MyValue2.setX(MyValue2.createDefault(), 42), };
!
! boolean[][] equalities = { { true, false, false, false, false, false, false, false, false },
! { false, true, false, false, false, false, false, false, false },
! { false, false, true, false, false, false, false, false, false },
! { false, false, false, ACmpOnValues == 3,false, false, false, ACmpOnValues == 3, false },
! { false, false, false, false, true, false, false, false, false },
! { false, false, false, false, false, true, false, false, false },
! { false, false, false, false, false, false, ACmpOnValues == 3, false, false },
! { false, false, false, ACmpOnValues == 3,false, false, false, ACmpOnValues == 3, false },
! { false, false, false, false, false, false, false, false, ACmpOnValues == 3 } };
// Run tests
for (Method m : getClass().getMethods()) {
if (m.getName().startsWith("test")) {
// Do some warmup runs
! runTest(m, args, 1000, nullMode, equalities);
// Make sure method is compiled
WHITE_BOX.enqueueMethodForCompilation(m, COMP_LEVEL_FULL_OPTIMIZATION);
Asserts.assertTrue(WHITE_BOX.isMethodCompiled(m, false), m + " not compiled");
// Run again to verify correctness of compiled code
! runTest(m, args, 1, nullMode, equalities);
}
}
for (int i = 0; i < 10_000; ++i) {
Asserts.assertTrue(cmpAlwaysEqual1(args[1], args[1]));
*** 1473,1484 ****
Asserts.assertTrue(cmpAlwaysUnEqual2(args[1], args[2]));
Asserts.assertFalse(cmpAlwaysUnEqual3(args[3]));
Asserts.assertTrue(cmpAlwaysUnEqual4(args[3]));
int idx = i % args.length;
! Asserts.assertEQ(cmpSometimesEqual1(args[idx]), idx != 3);
! Asserts.assertNE(cmpSometimesEqual2(args[idx]), idx != 3);
}
}
public static void main(String[] args) throws Exception {
if (Boolean.getBoolean("test.c1")) {
--- 1548,1559 ----
Asserts.assertTrue(cmpAlwaysUnEqual2(args[1], args[2]));
Asserts.assertFalse(cmpAlwaysUnEqual3(args[3]));
Asserts.assertTrue(cmpAlwaysUnEqual4(args[3]));
int idx = i % args.length;
! Asserts.assertEQ(cmpSometimesEqual1(args[idx]), args[idx] == null || !args[idx].getClass().isValue());
! Asserts.assertNE(cmpSometimesEqual2(args[idx]), args[idx] == null || !args[idx].getClass().isValue());
}
}
public static void main(String[] args) throws Exception {
if (Boolean.getBoolean("test.c1")) {
< prev index next >