# HG changeset patch # User Manuel Rigger # Date 1454426377 -3600 # Node ID 4b58c92e939bbb58117d76307fc0ee73490d6402 # Parent f41d4011035dfc227ae12d3b022311478b264af2 remove redundant modifiers diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java --- a/jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java Tue Feb 02 16:19:37 2016 +0100 @@ -157,7 +157,7 @@ * 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, @@ -175,7 +175,7 @@ /** * Set of flags to control code emission. */ - public static enum Flag { + public enum Flag { UseBarriersForVolatile, UseCRC32, UseNeon diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java --- a/jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java Tue Feb 02 16:19:37 2016 +0100 @@ -58,13 +58,13 @@ private final AArch64Kind scalar; private final EnumKey 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; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java --- a/jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java Tue Feb 02 16:19:37 2016 +0100 @@ -169,7 +169,7 @@ * 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, @@ -209,7 +209,7 @@ /** * Set of flags to control code emission. */ - public static enum Flag { + public enum Flag { UseCountLeadingZerosInstruction, UseCountTrailingZerosInstruction } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java --- a/jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java Tue Feb 02 16:19:37 2016 +0100 @@ -74,13 +74,13 @@ private final AMD64Kind scalar; private final EnumKey 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; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java --- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java Tue Feb 02 16:19:37 2016 +0100 @@ -39,7 +39,7 @@ * JMM's ReadAfterWrite.java test fails in -Xint mode without some kind of * memory barrier (i.e., it's not sufficient that the interpreter does not * reorder volatile references, the hardware also must not reorder them). - * + * * According to the new Java Memory Model (JMM): * (1) All volatiles are serialized wrt to each other. * ALSO reads & writes act as acquire & release, so: @@ -50,7 +50,7 @@ * that happen BEFORE the write float down to after the write. It's OK for * non-volatile memory refs that happen after the volatile write to float up * before it. - * + * * We only put in barriers around volatile refs (they are expensive), not * _between_ memory refs (which would require us to track the flavor of the * previous memory refs). Requirements (2) and (3) require some barriers diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java --- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/package-info.java Tue Feb 02 16:19:37 2016 +0100 @@ -1,29 +1,27 @@ /* - * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR + * REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * This code is free software; you can redistribute it and/or modify it under the terms of the GNU + * General Public License version 2 only, as published by the Free Software Foundation. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that + * This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU General Public License version 2 along with this work; + * if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA. * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or visit www.oracle.com + * if you need additional information or have any questions. */ /** - * Package that defines the interface between a Java application that wants to install code and the runtime. - * The runtime provides in implementation of the {@link jdk.vm.ci.code.CodeCacheProvider} interface. - * The method {@link jdk.vm.ci.code.CodeCacheProvider#addCode(jdk.vm.ci.meta.ResolvedJavaMethod, CompiledCode, jdk.vm.ci.meta.SpeculationLog, InstalledCode)} + * Package that defines the interface between a Java application that wants to install code and the + * runtime. The runtime provides in implementation of the {@link jdk.vm.ci.code.CodeCacheProvider} + * interface. The method + * {@link jdk.vm.ci.code.CodeCacheProvider#addCode(jdk.vm.ci.meta.ResolvedJavaMethod, CompiledCode, jdk.vm.ci.meta.SpeculationLog, InstalledCode)} * can be used to install code. */ package jdk.vm.ci.code; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java Tue Feb 02 16:19:37 2016 +0100 @@ -49,7 +49,7 @@ public static final Type[] VALUES = values(); - private HotSpotCallingConventionType(boolean out) { + HotSpotCallingConventionType(boolean out) { this.out = out; } } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java Tue Feb 02 16:19:37 2016 +0100 @@ -126,7 +126,7 @@ 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 @@ 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; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java Tue Feb 02 16:19:37 2016 +0100 @@ -38,7 +38,7 @@ protected final HotSpotJVMCIRuntimeProvider runtime; - public HotSpotMemoryAccessProviderImpl(HotSpotJVMCIRuntimeProvider runtime) { + HotSpotMemoryAccessProviderImpl(HotSpotJVMCIRuntimeProvider runtime) { this.runtime = runtime; } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java Tue Feb 02 16:19:37 2016 +0100 @@ -413,7 +413,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ private static class VirtualCallTypeData extends VirtualCallData { - public VirtualCallTypeData() { + VirtualCallTypeData() { super(Tag.VirtualCallTypeData, 0); } @@ -730,7 +730,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java Tue Feb 02 16:19:37 2016 +0100 @@ -56,7 +56,7 @@ private final int value; - private Tag(int value) { + Tag(int value) { this.value = value; } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java Tue Feb 02 16:19:37 2016 +0100 @@ -34,7 +34,7 @@ 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; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java Tue Feb 02 16:19:37 2016 +0100 @@ -60,7 +60,7 @@ public static class FieldLocationIdentity extends LocationIdentity { HotSpotResolvedJavaField inner; - public FieldLocationIdentity(HotSpotResolvedJavaFieldImpl inner) { + FieldLocationIdentity(HotSpotResolvedJavaFieldImpl inner) { this.inner = inner; } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java Tue Feb 02 16:19:37 2016 +0100 @@ -556,7 +556,7 @@ * * @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); diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java --- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java Tue Feb 02 16:19:37 2016 +0100 @@ -305,7 +305,7 @@ private long address; - public VMFields(long address) { + VMFields(long address) { this.address = address; } @@ -416,7 +416,7 @@ private long address; - public VMTypes(long address) { + VMTypes(long address) { this.address = address; } @@ -519,7 +519,7 @@ private long address; - public VMIntConstants(long address) { + VMIntConstants(long address) { this.address = address; } @@ -578,7 +578,7 @@ private long address; - public VMLongConstants(long address) { + VMLongConstants(long address) { this.address = address; } @@ -633,7 +633,7 @@ private long nameOffset; private long addrOffset; - public Flags(HashMap vmStructs, HashMap vmTypes) { + Flags(HashMap vmStructs, HashMap vmTypes) { address = vmStructs.get("Flag::flags").getValue(); entrySize = vmTypes.get("Flag").getSize(); typeOffset = vmStructs.get("Flag::_type").getOffset(); @@ -981,7 +981,8 @@ * this field is {@value #INVALID_RTLD_DEFAULT_HANDLE}, then this capability is not supported on * the current platform. */ - @HotSpotVMValue(expression = "RTLD_DEFAULT", defines = {"TARGET_OS_FAMILY_bsd", "TARGET_OS_FAMILY_linux"}, get = HotSpotVMValue.Type.ADDRESS) @Stable public long rtldDefault = INVALID_RTLD_DEFAULT_HANDLE; + @HotSpotVMValue(expression = "RTLD_DEFAULT", defines = {"TARGET_OS_FAMILY_bsd", + "TARGET_OS_FAMILY_linux"}, get = HotSpotVMValue.Type.ADDRESS) @Stable public long rtldDefault = INVALID_RTLD_DEFAULT_HANDLE; /** * This field is used to pass exception objects into and out of the runtime system during diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.hotspotvmconfig.processor/src/jdk/vm/ci/hotspotvmconfig/processor/HotSpotVMConfigProcessor.java --- a/jvmci/jdk.vm.ci.hotspotvmconfig.processor/src/jdk/vm/ci/hotspotvmconfig/processor/HotSpotVMConfigProcessor.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.hotspotvmconfig.processor/src/jdk/vm/ci/hotspotvmconfig/processor/HotSpotVMConfigProcessor.java Tue Feb 02 16:19:37 2016 +0100 @@ -54,12 +54,8 @@ import jdk.vm.ci.hotspotvmconfig.HotSpotVMType; import jdk.vm.ci.hotspotvmconfig.HotSpotVMValue; -@SupportedAnnotationTypes({ - "jdk.vm.ci.hotspotvmconfig.HotSpotVMConstant", - "jdk.vm.ci.hotspotvmconfig.HotSpotVMFlag", - "jdk.vm.ci.hotspotvmconfig.HotSpotVMField", - "jdk.vm.ci.hotspotvmconfig.HotSpotVMType", - "jdk.vm.ci.hotspotvmconfig.HotSpotVMValue"}) +@SupportedAnnotationTypes({"jdk.vm.ci.hotspotvmconfig.HotSpotVMConstant", "jdk.vm.ci.hotspotvmconfig.HotSpotVMFlag", "jdk.vm.ci.hotspotvmconfig.HotSpotVMField", + "jdk.vm.ci.hotspotvmconfig.HotSpotVMType", "jdk.vm.ci.hotspotvmconfig.HotSpotVMValue"}) public class HotSpotVMConfigProcessor extends AbstractProcessor { public HotSpotVMConfigProcessor() { @@ -266,7 +262,7 @@ private boolean optional; final VariableElement field; - public VMConfigField(VariableElement field, HotSpotVMField value) { + VMConfigField(VariableElement field, HotSpotVMField value) { this.field = field; define = archDefines(value.archs()); String type = field.asType().toString(); @@ -287,14 +283,14 @@ } } - public VMConfigField(VariableElement field, HotSpotVMType value) { + VMConfigField(VariableElement field, HotSpotVMType value) { this.field = field; define = null; // ((HotSpotVMType) annotation).archs(); String type = field.asType().toString(); setter = String.format("set_%s(\"%s\", sizeof(%s));", type, field.getSimpleName(), value.name()); } - public VMConfigField(VariableElement field, HotSpotVMValue value) { + VMConfigField(VariableElement field, HotSpotVMValue value) { this.field = field; String[] defines = value.defines(); int length = defines.length; @@ -314,14 +310,14 @@ } } - public VMConfigField(VariableElement field, HotSpotVMConstant value) { + VMConfigField(VariableElement field, HotSpotVMConstant value) { this.field = field; define = archDefines(value.archs()); String type = field.asType().toString(); setter = String.format("set_%s(\"%s\", %s);", type, field.getSimpleName(), value.name()); } - public VMConfigField(VariableElement field, HotSpotVMFlag value) { + VMConfigField(VariableElement field, HotSpotVMFlag value) { this.field = field; define = archDefines(value.archs()); optional = value.optional(); diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java --- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationAction.java Tue Feb 02 16:19:37 2016 +0100 @@ -59,7 +59,7 @@ private final boolean invalidatesCompilation; - private DeoptimizationAction(boolean invalidatesCompilation) { + DeoptimizationAction(boolean invalidatesCompilation) { this.invalidatesCompilation = invalidatesCompilation; } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java --- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/JavaKind.java Tue Feb 02 16:19:37 2016 +0100 @@ -72,7 +72,7 @@ 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; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java --- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LIRKind.java Tue Feb 02 16:19:37 2016 +0100 @@ -57,7 +57,7 @@ */ public final class LIRKind { - private static enum IllegalKind implements PlatformKind { + private enum IllegalKind implements PlatformKind { ILLEGAL; private final EnumKey key = new EnumKey<>(this); diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java --- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java Tue Feb 02 16:19:37 2016 +0100 @@ -35,7 +35,7 @@ * 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}. */ diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java --- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/PlatformKind.java Tue Feb 02 16:19:37 2016 +0100 @@ -33,7 +33,7 @@ } - public class EnumKey> implements Key { + class EnumKey> implements Key { private final Enum e; public EnumKey(Enum e) { diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java --- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/package-info.java Tue Feb 02 16:19:37 2016 +0100 @@ -1,29 +1,27 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR + * REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * This code is free software; you can redistribute it and/or modify it under the terms of the GNU + * General Public License version 2 only, as published by the Free Software Foundation. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that + * This code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU General Public License version 2 along with this work; + * if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA. * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or visit www.oracle.com + * if you need additional information or have any questions. */ /** - * Package that defines the interface between a runtime and a Java application that wants to access meta information. The runtime - * provides an implementation of the {@link jdk.vm.ci.meta.MetaAccessProvider} interface. + * Package that defines the interface between a runtime and a Java application that wants to access + * meta information. The runtime provides an implementation of the + * {@link jdk.vm.ci.meta.MetaAccessProvider} interface. */ package jdk.vm.ci.meta; diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java --- a/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/NameAndSignature.java Tue Feb 02 16:19:37 2016 +0100 @@ -39,7 +39,7 @@ 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(); diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java --- a/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Tue Feb 02 16:19:37 2016 +0100 @@ -500,7 +500,7 @@ final Method implementation; final Set declarations; - public Declarations(Method impl) { + Declarations(Method impl) { this.implementation = impl; declarations = new HashSet<>(); } diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java --- a/jvmci/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java Tue Feb 02 16:19:37 2016 +0100 @@ -69,8 +69,8 @@ /** * Gets an {@link Iterable} of the JVMCI providers available for a given service. * - * @throws SecurityException if a security manager is present and it denies - * {@link RuntimePermission}("jvmciServices") + * @throws SecurityException if a security manager is present and it denies + * {@link RuntimePermission}("jvmciServices") */ @SuppressWarnings("unchecked") public static Iterable load(Class service) { @@ -91,8 +91,8 @@ * @param service the service whose provider is being requested * @param required specifies if an {@link InternalError} should be thrown if no provider of * {@code service} is available - * @throws SecurityException if a security manager is present and it denies - * {@link RuntimePermission}("jvmciServices") + * @throws SecurityException if a security manager is present and it denies + * {@link RuntimePermission}("jvmciServices") */ @SuppressWarnings({"unchecked"}) public static S loadSingle(Class service, boolean required) { diff -r f41d4011035d -r 4b58c92e939b jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java --- a/jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java Sun Jan 31 22:39:09 2016 +0100 +++ b/jvmci/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARCKind.java Tue Feb 02 16:19:37 2016 +0100 @@ -47,13 +47,13 @@ private final SPARCKind scalar; private final EnumKey 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;