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

8149019: remove redundant modifiers

Browse Source 
Reviewed-by: twisti
This commit is contained in:
Doug Simon 2016-02-08 18:52:03 +01:00
parent 7c15712c40
commit 60a582e9be
24 changed files with 55 additions and 53 deletions

2
hotspot/.mx.jvmci/suite.py

@ -1,5 +1,5 @@
suite = {
"mxversion" : "5.6.11",
"mxversion" : "5.6.16",
"name" : "jvmci",
"url" : "http://openjdk.java.net/projects/graal",
"developer" : {

16
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java

@ -76,14 +76,14 @@ public class AArch64 extends Architecture {
public static final Register zr = r31;
public static final Register sp = r31;
// @formatter:off
public static final Register[] cpuRegisters = {
// @formatter:off
r0, r1, r2, r3, r4, r5, r6, r7,
r8, r9, r10, r11, r12, r13, r14, r15,
r16, r17, r18, r19, r20, r21, r22, r23,
r24, r25, r26, r27, r28, r29, r30, r31
// @formatter:on
};
// @formatter:on
public static final RegisterCategory SIMD = new RegisterCategory("SIMD");
@ -121,17 +121,17 @@ public class AArch64 extends Architecture {
public static final Register v30 = new Register(62, 30, "v30", SIMD);
public static final Register v31 = new Register(63, 31, "v31", SIMD);
// @formatter:off
public static final Register[] simdRegisters = {
// @formatter:off
v0, v1, v2, v3, v4, v5, v6, v7,
v8, v9, v10, v11, v12, v13, v14, v15,
v16, v17, v18, v19, v20, v21, v22, v23,
v24, v25, v26, v27, v28, v29, v30, v31
// @formatter:on
};
// @formatter:on
// @formatter:off
public static final Register[] allRegisters = {
// @formatter:off
r0, r1, r2, r3, r4, r5, r6, r7,
r8, r9, r10, r11, r12, r13, r14, r15,
r16, r17, r18, r19, r20, r21, r22, r23,
@ -141,14 +141,14 @@ public class AArch64 extends Architecture {
v8, v9, v10, v11, v12, v13, v14, v15,
v16, v17, v18, v19, v20, v21, v22, v23,
v24, v25, v26, v27, v28, v29, v30, v31
// @formatter:on
};
// @formatter:on
/**
* Basic set of CPU features mirroring what is returned from the cpuid instruction. See:
* {@code VM_Version::cpuFeatureFlags}.
*/
public static enum CPUFeature {
public enum CPUFeature {
FP,
ASIMD,
EVTSTRM,
@ -166,7 +166,7 @@ public class AArch64 extends Architecture {
/**
* Set of flags to control code emission.
*/
public static enum Flag {
public enum Flag {
UseBarriersForVolatile,
UseCRC32,
UseNeon

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java

@ -58,13 +58,13 @@ public enum AArch64Kind implements PlatformKind {
private final AArch64Kind scalar;
private final EnumKey<AArch64Kind> key = new EnumKey<>(this);
private AArch64Kind(int size) {
AArch64Kind(int size) {
this.size = size;
this.scalar = this;
this.vectorLength = 1;
}
private AArch64Kind(int size, AArch64Kind scalar) {
AArch64Kind(int size, AArch64Kind scalar) {
this.size = size;
this.scalar = scalar;

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java

@ -169,7 +169,7 @@ public class AMD64 extends Architecture {
* Basic set of CPU features mirroring what is returned from the cpuid instruction. See:
* {@code VM_Version::cpuFeatureFlags}.
*/
public static enum CPUFeature {
public enum CPUFeature {
CX8,
CMOV,
FXSR,
@ -210,7 +210,7 @@ public class AMD64 extends Architecture {
/**
* Set of flags to control code emission.
*/
public static enum Flag {
public enum Flag {
UseCountLeadingZerosInstruction,
UseCountTrailingZerosInstruction
}

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java

@ -74,13 +74,13 @@ public enum AMD64Kind implements PlatformKind {
private final AMD64Kind scalar;
private final EnumKey<AMD64Kind> key = new EnumKey<>(this);
private AMD64Kind(int size) {
AMD64Kind(int size) {
this.size = size;
this.scalar = this;
this.vectorLength = 1;
}
private AMD64Kind(int size, AMD64Kind scalar) {
AMD64Kind(int size, AMD64Kind scalar) {
this.size = size;
this.scalar = scalar;

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SourceStackTrace.java

@ -23,7 +23,7 @@
package jdk.vm.ci.code;
/**
* Class representing a exception with a stack trace of the currently processed position in the
* Class representing an exception with a stack trace of the currently processed position in the
* compiled Java program instead of the stack trace of the compiler. The exception of the compiler
* is saved as the cause of this exception.
*/
@ -36,7 +36,7 @@ public abstract class SourceStackTrace extends BailoutException {
private static final long serialVersionUID = 6279381376051787907L;
@Override
public final synchronized Throwable fillInStackTrace() {
public synchronized Throwable fillInStackTrace() {
assert elements != null;
setStackTrace(elements);
return this;

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java

@ -49,7 +49,7 @@ public enum HotSpotCallingConventionType implements CallingConvention.Type {
public static final Type[] VALUES = values();
private HotSpotCallingConventionType(boolean out) {
HotSpotCallingConventionType(boolean out) {
this.out = out;
}
}

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java

@ -126,7 +126,7 @@ final class HotSpotConstantPool implements ConstantPool, HotSpotProxified, Metas
private static final int InternalMin = config().jvmConstantInternalMin;
private static final int InternalMax = config().jvmConstantInternalMax;
private JVM_CONSTANT(int tag) {
JVM_CONSTANT(int tag) {
this.tag = tag;
}
@ -171,7 +171,7 @@ final class HotSpotConstantPool implements ConstantPool, HotSpotProxified, Metas
int lastCpi = Integer.MIN_VALUE;
JavaType javaType;
public LookupTypeCacheElement(int lastCpi, JavaType javaType) {
LookupTypeCacheElement(int lastCpi, JavaType javaType) {
super();
this.lastCpi = lastCpi;
this.javaType = javaType;

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java

@ -43,6 +43,7 @@ import jdk.vm.ci.code.CompiledCode;
import jdk.vm.ci.code.InstalledCode;
import jdk.vm.ci.common.JVMCIError;
import jdk.vm.ci.inittimer.InitTimer;
import jdk.vm.ci.inittimer.SuppressFBWarnings;
import jdk.vm.ci.meta.JVMCIMetaAccessContext;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.JavaType;
@ -115,7 +116,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
private boolean isDefault;
private final String help;
private Option(Class<?> type, Object defaultValue, String help) {
Option(Class<?> type, Object defaultValue, String help) {
assert Character.isUpperCase(name().charAt(0)) : "Option name must start with upper-case letter: " + name();
this.type = type;
this.value = UNINITIALIZED;
@ -123,6 +124,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider, H
this.help = help;
}
@SuppressFBWarnings(value = "ES_COMPARING_STRINGS_WITH_EQ", justification = "sentinel must be String since it's a static final in an enum")
private Object getValue() {
if (value == UNINITIALIZED) {
String propertyValue = VM.getSavedProperty(JVMCI_OPTION_PROPERTY_PREFIX + name());

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java

@ -38,7 +38,7 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, Ho
protected final HotSpotJVMCIRuntimeProvider runtime;
public HotSpotMemoryAccessProviderImpl(HotSpotJVMCIRuntimeProvider runtime) {
HotSpotMemoryAccessProviderImpl(HotSpotJVMCIRuntimeProvider runtime) {
this.runtime = runtime;
}

24
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java

@ -413,7 +413,7 @@ public final class HotSpotMethodData {
private static final int COUNTER_DATA_SIZE = cellIndexToOffset(1);
private static final int COUNTER_DATA_COUNT_OFFSET = cellIndexToOffset(config.methodDataCountOffset);
public CounterData() {
CounterData() {
super(Tag.CounterData, COUNTER_DATA_SIZE);
}
@ -442,7 +442,7 @@ public final class HotSpotMethodData {
protected static final int TAKEN_COUNT_OFFSET = cellIndexToOffset(config.jumpDataTakenOffset);
protected static final int TAKEN_DISPLACEMENT_OFFSET = cellIndexToOffset(config.jumpDataDisplacementOffset);
public JumpData() {
JumpData() {
super(Tag.JumpData, JUMP_DATA_SIZE);
}
@ -476,7 +476,7 @@ public final class HotSpotMethodData {
final long[] counts;
final long totalCount;
public RawItemProfile(int entries, T[] items, long[] counts, long totalCount) {
RawItemProfile(int entries, T[] items, long[] counts, long totalCount) {
this.entries = entries;
this.items = items;
this.counts = counts;
@ -587,7 +587,7 @@ public final class HotSpotMethodData {
private static final int TYPE_CHECK_DATA_SIZE = cellIndexToOffset(2) + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
public ReceiverTypeData() {
ReceiverTypeData() {
super(Tag.ReceiverTypeData, TYPE_CHECK_DATA_SIZE);
}
@ -612,7 +612,7 @@ public final class HotSpotMethodData {
private static final int VIRTUAL_CALL_DATA_FIRST_METHOD_OFFSET = TYPE_DATA_FIRST_TYPE_OFFSET + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
private static final int VIRTUAL_CALL_DATA_FIRST_METHOD_COUNT_OFFSET = TYPE_DATA_FIRST_TYPE_COUNT_OFFSET + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
public VirtualCallData() {
VirtualCallData() {
super(Tag.VirtualCallData, VIRTUAL_CALL_DATA_SIZE);
}
@ -714,7 +714,7 @@ public final class HotSpotMethodData {
private static class VirtualCallTypeData extends VirtualCallData {
public VirtualCallTypeData() {
VirtualCallTypeData() {
super(Tag.VirtualCallTypeData, 0);
}
@ -730,7 +730,7 @@ public final class HotSpotMethodData {
private static final int RET_DATA_ROW_SIZE = cellsToBytes(3);
private static final int RET_DATA_SIZE = cellIndexToOffset(1) + RET_DATA_ROW_SIZE * config.bciProfileWidth;
public RetData() {
RetData() {
super(Tag.RetData, RET_DATA_SIZE);
}
}
@ -740,7 +740,7 @@ public final class HotSpotMethodData {
private static final int BRANCH_DATA_SIZE = cellIndexToOffset(3);
private static final int NOT_TAKEN_COUNT_OFFSET = cellIndexToOffset(config.branchDataNotTakenOffset);
public BranchData() {
BranchData() {
super(Tag.BranchData, BRANCH_DATA_SIZE);
}
@ -773,7 +773,7 @@ public final class HotSpotMethodData {
private static final int ARRAY_DATA_LENGTH_OFFSET = cellIndexToOffset(config.arrayDataArrayLenOffset);
protected static final int ARRAY_DATA_START_OFFSET = cellIndexToOffset(config.arrayDataArrayStartOffset);
public ArrayData(Tag tag, int staticSize) {
ArrayData(Tag tag, int staticSize) {
super(tag, staticSize);
}
@ -800,7 +800,7 @@ public final class HotSpotMethodData {
private static final int MULTI_BRANCH_DATA_FIRST_COUNT_OFFSET = ARRAY_DATA_START_OFFSET + cellsToBytes(0);
private static final int MULTI_BRANCH_DATA_FIRST_DISPLACEMENT_OFFSET = ARRAY_DATA_START_OFFSET + cellsToBytes(1);
public MultiBranchData() {
MultiBranchData() {
super(Tag.MultiBranchData, MULTI_BRANCH_DATA_SIZE);
}
@ -882,13 +882,13 @@ public final class HotSpotMethodData {
private static final int ARG_INFO_DATA_SIZE = cellIndexToOffset(1);
public ArgInfoData() {
ArgInfoData() {
super(Tag.ArgInfoData, ARG_INFO_DATA_SIZE);
}
}
private static class UnknownProfileData extends AbstractMethodData {
public UnknownProfileData(Tag tag) {
UnknownProfileData(Tag tag) {
super(tag, 0);
}

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java

@ -56,7 +56,7 @@ public interface HotSpotMethodDataAccessor {
private final int value;
private Tag(int value) {
Tag(int value) {
this.value = value;
}

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java

@ -34,7 +34,7 @@ final class HotSpotMethodUnresolved extends HotSpotMethod {
private final Signature signature;
protected JavaType holder;
public HotSpotMethodUnresolved(String name, Signature signature, JavaType holder) {
HotSpotMethodUnresolved(String name, Signature signature, JavaType holder) {
super(name);
this.holder = holder;
this.signature = signature;

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java

@ -56,7 +56,7 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField, HotSpotP
public static class FieldLocationIdentity extends LocationIdentity {
HotSpotResolvedJavaField inner;
public FieldLocationIdentity(HotSpotResolvedJavaFieldImpl inner) {
FieldLocationIdentity(HotSpotResolvedJavaFieldImpl inner) {
this.inner = inner;
}

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java

@ -553,7 +553,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
*
* @param index index to the fields array
*/
public FieldInfo(int index) {
FieldInfo(int index) {
HotSpotVMConfig config = config();
// Get Klass::_fields
final long metaspaceFields = UNSAFE.getAddress(getMetaspaceKlass() + config.instanceKlassFieldsOffset);

12
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java

@ -360,7 +360,7 @@ public class HotSpotVMConfig {
private final long address;
public VMFields(long address) {
VMFields(long address) {
this.address = address;
}
@ -477,7 +477,7 @@ public class HotSpotVMConfig {
private final long address;
public VMTypes(long address) {
VMTypes(long address) {
this.address = address;
}
@ -580,7 +580,7 @@ public class HotSpotVMConfig {
private final long address;
public VMIntConstants(long address) {
VMIntConstants(long address) {
this.address = address;
}
@ -639,7 +639,7 @@ public class HotSpotVMConfig {
private final long address;
public VMLongConstants(long address) {
VMLongConstants(long address) {
this.address = address;
}
@ -698,7 +698,7 @@ public class HotSpotVMConfig {
private final long address;
public VMAddresses(long address) {
VMAddresses(long address) {
this.address = address;
}
@ -753,7 +753,7 @@ public class HotSpotVMConfig {
private final long nameOffset;
private final long addrOffset;
public Flags(HashMap<String, VMFields.Field> vmStructs, HashMap<String, VMTypes.Type> vmTypes) {
Flags(HashMap<String, VMFields.Field> vmStructs, HashMap<String, VMTypes.Type> vmTypes) {
address = vmStructs.get("Flag::flags").getValue();
entrySize = vmTypes.get("Flag").getSize();
typeOffset = vmStructs.get("Flag::_type").getOffset();

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java

@ -59,7 +59,7 @@ public enum DeoptimizationAction {
private final boolean invalidatesCompilation;
private DeoptimizationAction(boolean invalidatesCompilation) {
DeoptimizationAction(boolean invalidatesCompilation) {
this.invalidatesCompilation = invalidatesCompilation;
}

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java

@ -72,7 +72,7 @@ public enum JavaKind {
private final Class<?> boxedJavaClass;
private final int slotCount;
private JavaKind(char typeChar, String javaName, int slotCount, boolean isStackInt, Class<?> primitiveJavaClass, Class<?> boxedJavaClass) {
JavaKind(char typeChar, String javaName, int slotCount, boolean isStackInt, Class<?> primitiveJavaClass, Class<?> boxedJavaClass) {
this.typeChar = typeChar;
this.javaName = javaName;
this.slotCount = slotCount;

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java

@ -57,7 +57,7 @@ import java.util.ArrayList;
*/
public final class LIRKind {
private static enum IllegalKind implements PlatformKind {
private enum IllegalKind implements PlatformKind {
ILLEGAL;
private final EnumKey<IllegalKind> key = new EnumKey<>(this);

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java

@ -35,7 +35,7 @@ public interface MethodHandleAccessProvider {
* Identification for methods defined on the class {@link MethodHandle} that are processed by
* the {@link MethodHandleAccessProvider}.
*/
public enum IntrinsicMethod {
enum IntrinsicMethod {
/** The method {@code MethodHandle.invokeBasic}. */
INVOKE_BASIC,
/** The method {@code MethodHandle.linkToStatic}. */

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java

@ -33,7 +33,7 @@ public interface PlatformKind {
}
public class EnumKey<E extends Enum<E>> implements Key {
class EnumKey<E extends Enum<E>> implements Key {
private final Enum<E> e;
public EnumKey(Enum<E> e) {

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java

@ -47,13 +47,13 @@ public enum SPARCKind implements PlatformKind {
private final SPARCKind scalar;
private final EnumKey<SPARCKind> key = new EnumKey<>(this);
private SPARCKind(int size) {
SPARCKind(int size) {
this.size = size;
this.scalar = this;
this.vectorLength = 1;
}
private SPARCKind(int size, SPARCKind scalar) {
SPARCKind(int size, SPARCKind scalar) {
this.size = size;
this.scalar = scalar;

2
hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java

@ -39,7 +39,7 @@ class NameAndSignature {
final Class<?> returnType;
final Class<?>[] parameterTypes;
public NameAndSignature(Method m) {
NameAndSignature(Method m) {
this.name = m.getName();
this.returnType = m.getReturnType();
this.parameterTypes = m.getParameterTypes();

2
hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java

@ -500,7 +500,7 @@ public class TestResolvedJavaType extends TypeUniverse {
final Method implementation;
final Set<Method> declarations;
public Declarations(Method impl) {
Declarations(Method impl) {
this.implementation = impl;
declarations = new HashSet<>();
}