--- old/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java 2016-05-10 14:31:33.000000000 +0200 +++ new/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/ConstantEqualsDataProvider.java 2016-05-10 14:31:33.000000000 +0200 @@ -39,53 +39,53 @@ HashMap constMap = new HashMap<>(); constMap.put(DUMMY_CLASS_INSTANCE.booleanField, JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.booleanField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultBooleanField, - JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.stableDefaultBooleanField)); + JavaConstant.forBoolean(DUMMY_CLASS_INSTANCE.stableDefaultBooleanField)); constMap.put(DUMMY_CLASS_INSTANCE.byteField, JavaConstant.forByte(DUMMY_CLASS_INSTANCE.byteField)); constMap.put(DUMMY_CLASS_INSTANCE.finalByteField, JavaConstant.forByte(DUMMY_CLASS_INSTANCE.finalByteField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultByteField, - JavaConstant.forByte(DUMMY_CLASS_INSTANCE.stableDefaultByteField)); + JavaConstant.forByte(DUMMY_CLASS_INSTANCE.stableDefaultByteField)); constMap.put(DUMMY_CLASS_INSTANCE.shortField, JavaConstant.forShort(DUMMY_CLASS_INSTANCE.shortField)); constMap.put(DUMMY_CLASS_INSTANCE.finalShortField, JavaConstant.forShort(DUMMY_CLASS_INSTANCE.finalShortField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultShortField, - JavaConstant.forShort(DUMMY_CLASS_INSTANCE.stableDefaultShortField)); + JavaConstant.forShort(DUMMY_CLASS_INSTANCE.stableDefaultShortField)); constMap.put(DUMMY_CLASS_INSTANCE.intField, JavaConstant.forInt(DUMMY_CLASS_INSTANCE.intField)); constMap.put(DUMMY_CLASS_INSTANCE.finalIntField, JavaConstant.forInt(DUMMY_CLASS_INSTANCE.finalIntField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultIntField, - JavaConstant.forInt(DUMMY_CLASS_INSTANCE.stableDefaultIntField)); + JavaConstant.forInt(DUMMY_CLASS_INSTANCE.stableDefaultIntField)); constMap.put(DUMMY_CLASS_INSTANCE.longField, JavaConstant.forLong(DUMMY_CLASS_INSTANCE.longField)); constMap.put(DUMMY_CLASS_INSTANCE.finalLongField, JavaConstant.forLong(DUMMY_CLASS_INSTANCE.finalLongField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultLongField, - JavaConstant.forLong(DUMMY_CLASS_INSTANCE.stableDefaultLongField)); + JavaConstant.forLong(DUMMY_CLASS_INSTANCE.stableDefaultLongField)); constMap.put(DUMMY_CLASS_INSTANCE.doubleField, JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.doubleField)); constMap.put(DUMMY_CLASS_INSTANCE.finalDoubleField, - JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.finalDoubleField)); + JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.finalDoubleField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultDoubleField, - JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.stableDefaultDoubleField)); + JavaConstant.forDouble(DUMMY_CLASS_INSTANCE.stableDefaultDoubleField)); constMap.put(DUMMY_CLASS_INSTANCE.floatField, JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.floatField)); constMap.put(DUMMY_CLASS_INSTANCE.finalFloatField, JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.finalFloatField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultFloatField, - JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.stableDefaultFloatField)); + JavaConstant.forFloat(DUMMY_CLASS_INSTANCE.stableDefaultFloatField)); constMap.put(DUMMY_CLASS_INSTANCE.charField, JavaConstant.forChar(DUMMY_CLASS_INSTANCE.charField)); constMap.put(DUMMY_CLASS_INSTANCE.finalCharField, JavaConstant.forChar(DUMMY_CLASS_INSTANCE.finalCharField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultCharField, - JavaConstant.forChar(DUMMY_CLASS_INSTANCE.stableDefaultCharField)); + JavaConstant.forChar(DUMMY_CLASS_INSTANCE.stableDefaultCharField)); constMap.put(DUMMY_CLASS_INSTANCE.stringField, - CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField)); + CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField)); constMap.put(DUMMY_CLASS_INSTANCE.stringField2, - CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField2)); + CONSTANT_REFLECTION_PROVIDER.forString(DUMMY_CLASS_INSTANCE.stringField2)); constMap.put(DUMMY_CLASS_INSTANCE.objectField, - CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField)); + CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.objectField)); constMap.put(DUMMY_CLASS_INSTANCE.finalObjectField, - CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.finalObjectField)); + CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.finalObjectField)); constMap.put(DUMMY_CLASS_INSTANCE.stableDefaultObjectField, - CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.stableDefaultObjectField)); + CONSTANT_REFLECTION_PROVIDER.forObject(DUMMY_CLASS_INSTANCE.stableDefaultObjectField)); constMap.put(null, null); constMap.put(JavaConstant.NULL_POINTER, JavaConstant.NULL_POINTER); LinkedList cfgSet = new LinkedList<>(); constMap.entrySet().stream().forEach((obj1) -> { constMap.entrySet().stream().forEach((obj2) -> { cfgSet.add(new Object[]{obj1.getValue(), obj2.getValue(), - Objects.equals(obj1.getKey(), obj2.getKey())}); + Objects.equals(obj1.getKey(), obj2.getKey())}); }); }); return cfgSet.toArray(new Object[0][0]);