Mercurial > hg > graal-jvmci-8
changeset 22569:ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
line wrap: on
line diff
--- a/jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,15 +22,18 @@ */ package jdk.internal.jvmci.amd64; -import static jdk.internal.jvmci.code.MemoryBarriers.*; -import static jdk.internal.jvmci.code.Register.*; +import static jdk.internal.jvmci.code.MemoryBarriers.LOAD_STORE; +import static jdk.internal.jvmci.code.MemoryBarriers.STORE_STORE; +import static jdk.internal.jvmci.code.Register.SPECIAL; -import java.nio.*; -import java.util.*; +import java.nio.ByteOrder; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.Register; import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.PlatformKind; /** * Represents the AMD64 architecture.
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Architecture.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Architecture.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,11 +22,12 @@ */ package jdk.internal.jvmci.code; -import java.nio.*; -import java.util.*; +import java.nio.ByteOrder; +import java.util.Arrays; import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.PlatformKind; /** * Represents a CPU architecture, including information such as its endianness, CPU registers, word
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/BailoutException.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/BailoutException.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Locale; /** * Exception thrown when the compiler refuses to compile a method because of problems with the
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/BytecodeFrame.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/BytecodeFrame.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,12 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; /** * Represents the Java bytecode frame state(s) at a given position including {@link Value locations}
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/BytecodePosition.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/BytecodePosition.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,9 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; /** * Represents a code position, that is, a chain of inlined methods with bytecode locations, that is
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CallingConvention.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CallingConvention.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.isAllocatableValue; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; /** * A calling convention describes the locations in which the arguments for a call are placed and the
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeCacheProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeCacheProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,14 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.code.DataSection.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CompilationResult.Call; +import jdk.internal.jvmci.code.CompilationResult.DataPatch; +import jdk.internal.jvmci.code.CompilationResult.Mark; +import jdk.internal.jvmci.code.DataSection.Data; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.SpeculationLog; /** * Access to code cache related details and requirements.
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeUtil.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeUtil.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,15 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Signature; /** * Miscellaneous collection of utility methods used by {@code jdk.internal.jvmci.code} and its
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CompilationResult.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CompilationResult.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,13 +22,24 @@ */ package jdk.internal.jvmci.code; -import static java.util.Collections.*; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static java.util.Collections.emptyList; +import static java.util.Collections.unmodifiableList; +import static jdk.internal.jvmci.meta.MetaUtil.identityHashCodeString; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions.Assumption; +import jdk.internal.jvmci.meta.InvokeTarget; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.VMConstant; /** * Represents the output from compiling a method, including the compiled machine code, associated
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DataSection.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DataSection.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,15 +22,18 @@ */ package jdk.internal.jvmci.code; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static jdk.internal.jvmci.meta.MetaUtil.identityHashCodeString; -import java.nio.*; -import java.util.*; -import java.util.function.*; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Objects; +import java.util.function.Consumer; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.code.DataSection.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CompilationResult.DataPatch; +import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; +import jdk.internal.jvmci.code.DataSection.Data; +import jdk.internal.jvmci.meta.SerializableConstant; public final class DataSection implements Iterable<Data> {
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DebugInfo.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DebugInfo.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Objects; /** * Represents the debugging information for a particular point of execution. This information
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Register.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Register.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; /** * Represents a target machine register.
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterAttributes.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterAttributes.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Arrays; /** * A collection of register attributes. The specific attribute values for a register may be local to
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterConfig.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterConfig.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.PlatformKind; /** * A register configuration binds roles and {@linkplain RegisterAttributes attributes} to physical
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterSaveLayout.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterSaveLayout.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,11 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.TreeMap; /** * A map from registers to frame slots. This can be used to describe where callee saved registers
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/RegisterValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,9 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; /** * Denotes a register that stores a value of a fixed kind. There is exactly one (canonical) instance
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/StackLockValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/StackLockValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.Value; /** * Represents lock information in the debug information.
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/StackSlot.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/StackSlot.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; /** * Represents a compiler spill slot or an outgoing stack-based argument in a method's frame or an
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/StackSlotValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/StackSlotValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; /** * Common base class for {@linkplain StackSlot real} and {@linkplain VirtualStackSlot virtual} stack
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/TargetDescription.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/TargetDescription.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static jdk.internal.jvmci.meta.MetaUtil.identityHashCodeString; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; /** * Represents the target machine for a compiler, including the CPU architecture, the size of
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/UnsignedMath.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/UnsignedMath.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code; -import java.math.*; +import java.math.BigInteger; //JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/ValueUtil.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/ValueUtil.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,14 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; /** * Utility class for working with the {@link Value} class and its subclasses.
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/VirtualObject.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/VirtualObject.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,15 @@ */ package jdk.internal.jvmci.code; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Set; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * An instance of this class represents an object whose allocation was removed by escape analysis.
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/VirtualStackSlot.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/VirtualStackSlot.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; /** * {@link VirtualStackSlot}s are stack slots that are not yet fixed to specific frame offset. They
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/stack/InspectedFrame.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/stack/InspectedFrame.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code.stack; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; public interface InspectedFrame {
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/stack/StackIntrospection.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/stack/StackIntrospection.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.code.stack; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; public interface StackIntrospection {
--- a/jvmci/jdk.internal.jvmci.common/src/jdk/internal/jvmci/common/JVMCIError.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.common/src/jdk/internal/jvmci/common/JVMCIError.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.common; -import java.util.*; +import java.util.ArrayList; +import java.util.Locale; /** * Indicates a condition in JVMCI related code that should never occur during normal operation.
--- a/jvmci/jdk.internal.jvmci.compiler/src/jdk/internal/jvmci/compiler/Compiler.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.compiler/src/jdk/internal/jvmci/compiler/Compiler.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.compiler; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; public interface Compiler { int INVOCATION_ENTRY_BCI = -1;
--- a/jvmci/jdk.internal.jvmci.compiler/src/jdk/internal/jvmci/compiler/CompilerFactory.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.compiler/src/jdk/internal/jvmci/compiler/CompilerFactory.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,8 @@ */ package jdk.internal.jvmci.compiler; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.runtime.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.runtime.JVMCIRuntime; /** * Factory for a JVMCI compiler.
--- a/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,18 +22,25 @@ */ package jdk.internal.jvmci.hotspot.amd64; -import static jdk.internal.jvmci.inittimer.InitTimer.*; +import static jdk.internal.jvmci.inittimer.InitTimer.timer; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.compiler.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.inittimer.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.compiler.CompilerFactory; +import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; +import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIBackendFactory; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.inittimer.InitTimer; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.runtime.JVMCIBackend; +import jdk.internal.jvmci.service.ServiceProvider; @ServiceProvider(HotSpotJVMCIBackendFactory.class) public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
--- a/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,16 +22,61 @@ */ package jdk.internal.jvmci.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.*; - -import java.util.*; +import static jdk.internal.jvmci.amd64.AMD64.r10; +import static jdk.internal.jvmci.amd64.AMD64.r11; +import static jdk.internal.jvmci.amd64.AMD64.r12; +import static jdk.internal.jvmci.amd64.AMD64.r13; +import static jdk.internal.jvmci.amd64.AMD64.r14; +import static jdk.internal.jvmci.amd64.AMD64.r8; +import static jdk.internal.jvmci.amd64.AMD64.r9; +import static jdk.internal.jvmci.amd64.AMD64.rax; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.amd64.AMD64.rbx; +import static jdk.internal.jvmci.amd64.AMD64.rcx; +import static jdk.internal.jvmci.amd64.AMD64.rdi; +import static jdk.internal.jvmci.amd64.AMD64.rdx; +import static jdk.internal.jvmci.amd64.AMD64.rsi; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import static jdk.internal.jvmci.amd64.AMD64.xmm0; +import static jdk.internal.jvmci.amd64.AMD64.xmm1; +import static jdk.internal.jvmci.amd64.AMD64.xmm10; +import static jdk.internal.jvmci.amd64.AMD64.xmm11; +import static jdk.internal.jvmci.amd64.AMD64.xmm12; +import static jdk.internal.jvmci.amd64.AMD64.xmm13; +import static jdk.internal.jvmci.amd64.AMD64.xmm14; +import static jdk.internal.jvmci.amd64.AMD64.xmm15; +import static jdk.internal.jvmci.amd64.AMD64.xmm2; +import static jdk.internal.jvmci.amd64.AMD64.xmm3; +import static jdk.internal.jvmci.amd64.AMD64.xmm4; +import static jdk.internal.jvmci.amd64.AMD64.xmm5; +import static jdk.internal.jvmci.amd64.AMD64.xmm6; +import static jdk.internal.jvmci.amd64.AMD64.xmm7; +import static jdk.internal.jvmci.amd64.AMD64.xmm8; +import static jdk.internal.jvmci.amd64.AMD64.xmm9; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterAttributes; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; public class AMD64HotSpotRegisterConfig implements RegisterConfig {
--- a/jvmci/jdk.internal.jvmci.hotspot.jfr/src/jdk/internal/jvmci/hotspot/jfr/events/JFREventProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot.jfr/src/jdk/internal/jvmci/hotspot/jfr/events/JFREventProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,20 +22,23 @@ */ package jdk.internal.jvmci.hotspot.jfr.events; -import java.net.*; +import java.net.URISyntaxException; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.events.*; -import jdk.internal.jvmci.hotspot.events.EmptyEventProvider.*; -import jdk.internal.jvmci.service.*; - -import com.oracle.jrockit.jfr.*; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.events.EmptyEventProvider.EmptyCompilationEvent; +import jdk.internal.jvmci.hotspot.events.EmptyEventProvider.EmptyCompilerFailureEvent; +import jdk.internal.jvmci.hotspot.events.EventProvider; +import jdk.internal.jvmci.service.ServiceProvider; /** * A JFR implementation for {@link EventProvider}. This implementation is used when Flight Recorder * is turned on. + * + * Note: The use of fully qualified names for deprecated types is a workaround for <a + * href="https://bugs.openjdk.java.net/browse/JDK-8032211">JDK-8032211</a>. */ @ServiceProvider(EventProvider.class) +@SuppressWarnings("deprecation") public final class JFREventProvider implements EventProvider { private final boolean enabled; @@ -43,12 +46,11 @@ /** * Need to store the producer in a field so that it doesn't disappear. */ - @SuppressWarnings({"deprecation", "unused"}) private final Producer producer; + @SuppressWarnings("unused") private final com.oracle.jrockit.jfr.Producer producer; - @SuppressWarnings("deprecation") public JFREventProvider() { enabled = HotSpotJVMCIRuntime.runtime().getConfig().flightRecorder; - Producer p = null; + com.oracle.jrockit.jfr.Producer p = null; if (enabled) { try { /* @@ -57,11 +59,11 @@ * doesn't show JVMCI events in the "Code" tab. There are plans to revise the JFR * code for JDK 9. */ - p = new Producer("HotSpot JVM", "Oracle Hotspot JVM", "http://www.oracle.com/hotspot/jvm/"); + p = new com.oracle.jrockit.jfr.Producer("HotSpot JVM", "Oracle Hotspot JVM", "http://www.oracle.com/hotspot/jvm/"); p.register(); // Register event classes with Producer. for (Class<?> c : JFREventProvider.class.getDeclaredClasses()) { - if (c.isAnnotationPresent(EventDefinition.class)) { + if (c.isAnnotationPresent(com.oracle.jrockit.jfr.EventDefinition.class)) { assert com.oracle.jrockit.jfr.InstantEvent.class.isAssignableFrom(c) : c; registerEvent(p, c); } @@ -74,16 +76,16 @@ } /** - * Register an event class with the {@link Producer}. + * Register an event class with the {@link com.oracle.jrockit.jfr.Producer}. * * @param c event class * @return the {@link EventToken event token} */ - @SuppressWarnings({"deprecation", "javadoc", "unchecked"}) - private static EventToken registerEvent(Producer producer, Class<?> c) { + @SuppressWarnings({"javadoc", "unchecked"}) + private static com.oracle.jrockit.jfr.EventToken registerEvent(com.oracle.jrockit.jfr.Producer producer, Class<?> c) { try { return producer.addEvent((Class<? extends com.oracle.jrockit.jfr.InstantEvent>) c); - } catch (InvalidEventDefinitionException | InvalidValueException e) { + } catch (com.oracle.jrockit.jfr.InvalidEventDefinitionException | com.oracle.jrockit.jfr.InvalidValueException e) { throw new InternalError(e); } } @@ -101,20 +103,19 @@ * <p> * See: event {@code Compilation} in {@code src/share/vm/trace/trace.xml} */ - @SuppressWarnings("deprecation") - @EventDefinition(name = "Compilation", path = "vm/compiler/compilation") + @com.oracle.jrockit.jfr.EventDefinition(name = "Compilation", path = "vm/compiler/compilation") public static class JFRCompilationEvent extends com.oracle.jrockit.jfr.DurationEvent implements CompilationEvent { /* * FIXME method should be a Method* but we can't express that in Java. */ - @ValueDefinition(name = "Java Method") public String method; - @ValueDefinition(name = "Compilation ID", relationKey = "COMP_ID") public int compileId; - @ValueDefinition(name = "Compilation Level") public short compileLevel; - @ValueDefinition(name = "Succeeded") public boolean succeeded; - @ValueDefinition(name = "On Stack Replacement") public boolean isOsr; - @ValueDefinition(name = "Compiled Code Size", contentType = ContentType.Bytes) public int codeSize; - @ValueDefinition(name = "Inlined Code Size", contentType = ContentType.Bytes) public int inlinedBytes; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Java Method") public String method; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Compilation ID", relationKey = "COMP_ID") public int compileId; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Compilation Level") public short compileLevel; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Succeeded") public boolean succeeded; + @com.oracle.jrockit.jfr.ValueDefinition(name = "On Stack Replacement") public boolean isOsr; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Compiled Code Size", contentType = com.oracle.jrockit.jfr.ContentType.Bytes) public int codeSize; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Inlined Code Size", contentType = com.oracle.jrockit.jfr.ContentType.Bytes) public int inlinedBytes; public void setMethod(String method) { this.method = method; @@ -158,12 +159,11 @@ * <p> * See: event {@code CompilerFailure} in {@code src/share/vm/trace/trace.xml} */ - @SuppressWarnings("deprecation") - @EventDefinition(name = "Compilation Failure", path = "vm/compiler/failure") + @com.oracle.jrockit.jfr.EventDefinition(name = "Compilation Failure", path = "vm/compiler/failure") public static class JFRCompilerFailureEvent extends com.oracle.jrockit.jfr.InstantEvent implements CompilerFailureEvent { - @ValueDefinition(name = "Compilation ID", relationKey = "COMP_ID") public int compileId; - @ValueDefinition(name = "Message", description = "The failure message") public String failure; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Compilation ID", relationKey = "COMP_ID") public int compileId; + @com.oracle.jrockit.jfr.ValueDefinition(name = "Message", description = "The failure message") public String failure; public void setCompileId(int id) { this.compileId = id;
--- a/jvmci/jdk.internal.jvmci.hotspot.sparc/src/jdk/internal/jvmci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot.sparc/src/jdk/internal/jvmci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,17 +22,24 @@ */ package jdk.internal.jvmci.hotspot.sparc; -import static jdk.internal.jvmci.inittimer.InitTimer.*; +import static jdk.internal.jvmci.inittimer.InitTimer.timer; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.compiler.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.inittimer.*; -import jdk.internal.jvmci.runtime.*; -import jdk.internal.jvmci.service.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.compiler.CompilerFactory; +import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; +import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIBackendFactory; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.inittimer.InitTimer; +import jdk.internal.jvmci.runtime.JVMCIBackend; +import jdk.internal.jvmci.service.ServiceProvider; +import jdk.internal.jvmci.sparc.SPARC; import jdk.internal.jvmci.sparc.SPARC.CPUFeature; @ServiceProvider(HotSpotJVMCIBackendFactory.class)
--- a/jvmci/jdk.internal.jvmci.hotspot.sparc/src/jdk/internal/jvmci/hotspot/sparc/SPARCHotSpotRegisterConfig.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot.sparc/src/jdk/internal/jvmci/hotspot/sparc/SPARCHotSpotRegisterConfig.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,16 +22,113 @@ */ package jdk.internal.jvmci.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.*; - -import java.util.*; +import static jdk.internal.jvmci.sparc.SPARC.CPU; +import static jdk.internal.jvmci.sparc.SPARC.FPUd; +import static jdk.internal.jvmci.sparc.SPARC.FPUs; +import static jdk.internal.jvmci.sparc.SPARC.d0; +import static jdk.internal.jvmci.sparc.SPARC.d2; +import static jdk.internal.jvmci.sparc.SPARC.d32; +import static jdk.internal.jvmci.sparc.SPARC.d34; +import static jdk.internal.jvmci.sparc.SPARC.d36; +import static jdk.internal.jvmci.sparc.SPARC.d38; +import static jdk.internal.jvmci.sparc.SPARC.d4; +import static jdk.internal.jvmci.sparc.SPARC.d40; +import static jdk.internal.jvmci.sparc.SPARC.d42; +import static jdk.internal.jvmci.sparc.SPARC.d44; +import static jdk.internal.jvmci.sparc.SPARC.d46; +import static jdk.internal.jvmci.sparc.SPARC.d48; +import static jdk.internal.jvmci.sparc.SPARC.d50; +import static jdk.internal.jvmci.sparc.SPARC.d52; +import static jdk.internal.jvmci.sparc.SPARC.d54; +import static jdk.internal.jvmci.sparc.SPARC.d56; +import static jdk.internal.jvmci.sparc.SPARC.d58; +import static jdk.internal.jvmci.sparc.SPARC.d6; +import static jdk.internal.jvmci.sparc.SPARC.d60; +import static jdk.internal.jvmci.sparc.SPARC.d62; +import static jdk.internal.jvmci.sparc.SPARC.f0; +import static jdk.internal.jvmci.sparc.SPARC.f1; +import static jdk.internal.jvmci.sparc.SPARC.f10; +import static jdk.internal.jvmci.sparc.SPARC.f11; +import static jdk.internal.jvmci.sparc.SPARC.f12; +import static jdk.internal.jvmci.sparc.SPARC.f13; +import static jdk.internal.jvmci.sparc.SPARC.f14; +import static jdk.internal.jvmci.sparc.SPARC.f15; +import static jdk.internal.jvmci.sparc.SPARC.f16; +import static jdk.internal.jvmci.sparc.SPARC.f17; +import static jdk.internal.jvmci.sparc.SPARC.f18; +import static jdk.internal.jvmci.sparc.SPARC.f19; +import static jdk.internal.jvmci.sparc.SPARC.f2; +import static jdk.internal.jvmci.sparc.SPARC.f20; +import static jdk.internal.jvmci.sparc.SPARC.f21; +import static jdk.internal.jvmci.sparc.SPARC.f22; +import static jdk.internal.jvmci.sparc.SPARC.f23; +import static jdk.internal.jvmci.sparc.SPARC.f24; +import static jdk.internal.jvmci.sparc.SPARC.f25; +import static jdk.internal.jvmci.sparc.SPARC.f26; +import static jdk.internal.jvmci.sparc.SPARC.f27; +import static jdk.internal.jvmci.sparc.SPARC.f28; +import static jdk.internal.jvmci.sparc.SPARC.f29; +import static jdk.internal.jvmci.sparc.SPARC.f3; +import static jdk.internal.jvmci.sparc.SPARC.f30; +import static jdk.internal.jvmci.sparc.SPARC.f31; +import static jdk.internal.jvmci.sparc.SPARC.f4; +import static jdk.internal.jvmci.sparc.SPARC.f5; +import static jdk.internal.jvmci.sparc.SPARC.f6; +import static jdk.internal.jvmci.sparc.SPARC.f7; +import static jdk.internal.jvmci.sparc.SPARC.f8; +import static jdk.internal.jvmci.sparc.SPARC.f9; +import static jdk.internal.jvmci.sparc.SPARC.g1; +import static jdk.internal.jvmci.sparc.SPARC.g2; +import static jdk.internal.jvmci.sparc.SPARC.g3; +import static jdk.internal.jvmci.sparc.SPARC.g4; +import static jdk.internal.jvmci.sparc.SPARC.g5; +import static jdk.internal.jvmci.sparc.SPARC.g6; +import static jdk.internal.jvmci.sparc.SPARC.g7; +import static jdk.internal.jvmci.sparc.SPARC.i0; +import static jdk.internal.jvmci.sparc.SPARC.i1; +import static jdk.internal.jvmci.sparc.SPARC.i2; +import static jdk.internal.jvmci.sparc.SPARC.i3; +import static jdk.internal.jvmci.sparc.SPARC.i4; +import static jdk.internal.jvmci.sparc.SPARC.i5; +import static jdk.internal.jvmci.sparc.SPARC.i6; +import static jdk.internal.jvmci.sparc.SPARC.i7; +import static jdk.internal.jvmci.sparc.SPARC.l0; +import static jdk.internal.jvmci.sparc.SPARC.l1; +import static jdk.internal.jvmci.sparc.SPARC.l2; +import static jdk.internal.jvmci.sparc.SPARC.l3; +import static jdk.internal.jvmci.sparc.SPARC.l4; +import static jdk.internal.jvmci.sparc.SPARC.l5; +import static jdk.internal.jvmci.sparc.SPARC.l6; +import static jdk.internal.jvmci.sparc.SPARC.l7; +import static jdk.internal.jvmci.sparc.SPARC.o0; +import static jdk.internal.jvmci.sparc.SPARC.o1; +import static jdk.internal.jvmci.sparc.SPARC.o2; +import static jdk.internal.jvmci.sparc.SPARC.o3; +import static jdk.internal.jvmci.sparc.SPARC.o4; +import static jdk.internal.jvmci.sparc.SPARC.o5; +import static jdk.internal.jvmci.sparc.SPARC.o7; +import static jdk.internal.jvmci.sparc.SPARC.sp; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import java.util.ArrayList; +import java.util.Arrays; + +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterAttributes; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.sparc.SPARC; public class SPARCHotSpotRegisterConfig implements RegisterConfig {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCodeCacheProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCodeCacheProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,15 +22,30 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant.*; +import static jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant.COMPRESSED_NULL; -import java.lang.reflect.*; +import java.lang.reflect.Field; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.code.DataSection.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.CompilationResult.Call; +import jdk.internal.jvmci.code.CompilationResult.ConstantReference; +import jdk.internal.jvmci.code.CompilationResult.DataPatch; +import jdk.internal.jvmci.code.CompilationResult.Mark; +import jdk.internal.jvmci.code.DataSection; +import jdk.internal.jvmci.code.DataSection.Data; +import jdk.internal.jvmci.code.DataSection.DataBuilder; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.SerializableConstant; +import jdk.internal.jvmci.meta.SpeculationLog; +import jdk.internal.jvmci.meta.VMConstant; /** * HotSpot implementation of {@link CodeCacheProvider}.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCompiledCode.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCompiledCode.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,12 +22,16 @@ */ package jdk.internal.jvmci.hotspot; -import java.nio.*; -import java.util.*; -import java.util.stream.*; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Stream; import java.util.stream.Stream.Builder; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.CompilationResult; import jdk.internal.jvmci.code.CompilationResult.CodeAnnotation; import jdk.internal.jvmci.code.CompilationResult.CodeComment; import jdk.internal.jvmci.code.CompilationResult.DataPatch; @@ -36,8 +40,9 @@ import jdk.internal.jvmci.code.CompilationResult.JumpTable; import jdk.internal.jvmci.code.CompilationResult.Mark; import jdk.internal.jvmci.code.CompilationResult.Site; +import jdk.internal.jvmci.code.DataSection; import jdk.internal.jvmci.meta.Assumptions.Assumption; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; /** * A {@link CompilationResult} with additional HotSpot-specific information required for installing
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCompiledNmethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCompiledNmethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,8 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.inittimer.*; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.inittimer.SuppressFBWarnings; /** * {@link HotSpotCompiledCode} destined for installation as an nmethod.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCompressedNullConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotCompressedNullConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; /** * The compressed representation of the {@link JavaConstant#NULL_POINTER null constant}.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; /** * Marker interface for hotspot specific constants.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,13 +22,20 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import java.lang.invoke.*; +import java.lang.invoke.MethodHandle; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantPool; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; /** * Implementation of {@link ConstantPool} for HotSpot.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIBackendFactory.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIBackendFactory.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,8 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.compiler.*; -import jdk.internal.jvmci.runtime.*; +import jdk.internal.jvmci.compiler.CompilerFactory; +import jdk.internal.jvmci.runtime.JVMCIBackend; public interface HotSpotJVMCIBackendFactory {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCICompilerConfig.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCICompilerConfig.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,13 +22,13 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.compiler.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.common.JVMCIError; import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.compiler.CompilerFactory; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.runtime.JVMCIRuntime; +import jdk.internal.jvmci.service.Services; final class HotSpotJVMCICompilerConfig {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIMetaAccessContext.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIMetaAccessContext.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,17 @@ */ package jdk.internal.jvmci.hotspot; -import java.lang.ref.*; -import java.util.*; +import java.lang.ref.Reference; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; +import java.util.WeakHashMap; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JVMCIMetaAccessContext; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * This class manages the set of metadata roots that must be scanned during garbage collection.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntimeProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJVMCIRuntimeProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,11 +22,14 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; -import sun.misc.*; +import jdk.internal.jvmci.meta.JVMCIMetaAccessContext; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.runtime.JVMCIRuntime; +import sun.misc.Unsafe; //JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotJavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaType; /** * Common base class for all HotSpot {@link JavaType} implementations.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMemoryAccessProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMemoryAccessProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MemoryAccessProvider; /** * HotSpot specific extension of {@link MemoryAccessProvider}.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMetaAccessProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMetaAccessProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -23,14 +23,29 @@ package jdk.internal.jvmci.hotspot; import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.*; +import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import java.lang.reflect.*; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Executable; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; // JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMetaspaceConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMetaspaceConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,9 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.VMConstant; public interface HotSpotMetaspaceConstant extends HotSpotConstant, VMConstant {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMetaspaceConstantImpl.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMetaspaceConstantImpl.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,11 @@ */ package jdk.internal.jvmci.hotspot; -import java.util.*; +import java.util.Objects; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.VMConstant; public final class HotSpotMetaspaceConstantImpl implements HotSpotMetaspaceConstant, VMConstant, HotSpotProxified {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,15 @@ */ package jdk.internal.jvmci.hotspot; -import static java.util.FormattableFlags.*; -import java.util.*; +import static java.util.FormattableFlags.ALTERNATE; +import static java.util.FormattableFlags.LEFT_JUSTIFY; +import static java.util.FormattableFlags.UPPERCASE; -import jdk.internal.jvmci.meta.*; +import java.util.Formattable; +import java.util.Formatter; + +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; public abstract class HotSpotMethod implements JavaMethod, Formattable /* , JavaMethodContex */{
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodData.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodData.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,17 +22,22 @@ */ package jdk.internal.jvmci.hotspot; -import static java.lang.String.*; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; +import static java.lang.String.format; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.hotspot.HotSpotMethodDataAccessor.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.JavaMethodProfile.*; -import jdk.internal.jvmci.meta.JavaTypeProfile.*; -import sun.misc.*; +import jdk.internal.jvmci.hotspot.HotSpotMethodDataAccessor.Tag; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaMethodProfile; +import jdk.internal.jvmci.meta.JavaMethodProfile.ProfiledMethod; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; +import sun.misc.Unsafe; /** * Access to a HotSpot MethodData structure (defined in methodData.hpp).
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodDataAccessor.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodDataAccessor.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,11 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import jdk.internal.jvmci.meta.JavaMethodProfile; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.TriState; /** * Interface for accessor objects that encapsulate the logic for accessing the different kinds of
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodHandleAccessProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodHandleAccessProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,15 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; -import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MethodHandleAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, HotSpotProxified {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodUnresolved.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodUnresolved.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,9 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.Signature; /** * Implementation of {@link JavaMethod} for unresolved HotSpot methods.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotNmethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotNmethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,12 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; /** * Implementation of {@link InstalledCode} for code installed as an nmethod. The nmethod stores a
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotObjectConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotObjectConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,13 @@ */ package jdk.internal.jvmci.hotspot; -import java.lang.invoke.*; -import java.util.*; +import java.lang.invoke.CallSite; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.VMConstant; /** * Represents a constant non-{@code null} object reference, within the compiler and across the
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotObjectConstantImpl.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotObjectConstantImpl.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,12 +22,18 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.*; +import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass; + +import java.lang.invoke.CallSite; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MethodHandle; -import java.lang.invoke.*; - -import jdk.internal.jvmci.inittimer.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.inittimer.SuppressFBWarnings; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Represents a constant non-{@code null} object reference, within the compiler and across the
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotProfilingInfo.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotProfilingInfo.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,11 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaMethodProfile; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.TriState; public final class HotSpotProfilingInfo implements ProfilingInfo, HotSpotProxified {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotReferenceMap.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotReferenceMap.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,10 @@ */ package jdk.internal.jvmci.hotspot; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Location; +import jdk.internal.jvmci.code.ReferenceMap; public final class HotSpotReferenceMap extends ReferenceMap {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaField.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaField; /** * Represents a field in a HotSpot type.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaFieldImpl.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaFieldImpl.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,15 +22,22 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; -import static jdk.internal.jvmci.hotspot.HotSpotResolvedJavaFieldImpl.Options.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import static jdk.internal.jvmci.hotspot.HotSpotResolvedJavaFieldImpl.Options.ImplicitStableValues; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; -import java.lang.annotation.*; -import java.lang.reflect.*; - -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ModifiersProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; /** * Represents a field in a HotSpot type.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,11 @@ */ package jdk.internal.jvmci.hotspot; -import java.lang.reflect.*; +import java.lang.reflect.Modifier; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Implementation of {@link JavaMethod} for resolved HotSpot methods.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,17 +22,44 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; -import static jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl.Options.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import static jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl.Options.UseProfilingInformation; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantPool; +import jdk.internal.jvmci.meta.DefaultProfilingInfo; +import jdk.internal.jvmci.meta.ExceptionHandler; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LineNumberTable; +import jdk.internal.jvmci.meta.LineNumberTableImpl; +import jdk.internal.jvmci.meta.Local; +import jdk.internal.jvmci.meta.LocalImpl; +import jdk.internal.jvmci.meta.LocalVariableTable; +import jdk.internal.jvmci.meta.LocalVariableTableImpl; +import jdk.internal.jvmci.meta.ModifiersProvider; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; +import jdk.internal.jvmci.meta.SpeculationLog; +import jdk.internal.jvmci.meta.TriState; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; /** * Implementation of {@link JavaMethod} for resolved HotSpot methods.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaType; public abstract class HotSpotResolvedJavaType extends HotSpotJavaType implements ResolvedJavaType {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,15 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantPool; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,19 +22,37 @@ */ package jdk.internal.jvmci.hotspot; -import static java.util.Objects.*; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; +import static java.util.Objects.requireNonNull; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.net.*; -import java.nio.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.Assumptions.ConcreteMethod; +import jdk.internal.jvmci.meta.Assumptions.ConcreteSubtype; +import jdk.internal.jvmci.meta.Assumptions.LeafType; +import jdk.internal.jvmci.meta.Assumptions.NoFinalizableSubclass; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ModifiersProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TrustedInterface; /** * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedPrimitiveType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedPrimitiveType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,15 +22,21 @@ */ package jdk.internal.jvmci.hotspot; -import static java.util.Objects.*; +import static java.util.Objects.requireNonNull; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Array; +import java.lang.reflect.Modifier; +import java.net.URL; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.net.*; - -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Implementation of {@link JavaType} for primitive HotSpot types.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotSignature.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotSignature.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,14 @@ */ package jdk.internal.jvmci.hotspot; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; /** * Represents a method signature.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotSpeculationLog.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotSpeculationLog.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.SpeculationLog; public class HotSpotSpeculationLog extends SpeculationLog {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotStackFrameReference.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotStackFrameReference.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,10 @@ */ package jdk.internal.jvmci.hotspot; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.code.stack.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.stack.InspectedFrame; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; public class HotSpotStackFrameReference implements InspectedFrame {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotUnresolvedField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotUnresolvedField.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.JavaType; /** * A implementation of {@link JavaField} for an unresolved field.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotUnresolvedJavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotUnresolvedJavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,9 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Implementation of {@link JavaType} for unresolved HotSpot classes.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java Wed Sep 16 13:40:05 2015 +0200 @@ -25,11 +25,17 @@ import static jdk.internal.jvmci.common.UnsafeUtil.readCString; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.Iterator; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspotvmconfig.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMConstant; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMField; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMFlag; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMType; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMValue; //JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfigVerifier.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfigVerifier.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,16 +22,25 @@ */ package jdk.internal.jvmci.hotspot; -import static java.lang.String.*; +import static java.lang.String.format; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Executable; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.Objects; -import jdk.internal.jvmci.common.*; -import jdk.internal.org.objectweb.asm.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.org.objectweb.asm.ClassReader; +import jdk.internal.org.objectweb.asm.ClassVisitor; +import jdk.internal.org.objectweb.asm.Label; +import jdk.internal.org.objectweb.asm.MethodVisitor; +import jdk.internal.org.objectweb.asm.Opcodes; import jdk.internal.org.objectweb.asm.Type; -import sun.misc.*; +import sun.misc.Unsafe; /** * A {@link ClassVisitor} that verifies {@link HotSpotVMConfig} does not access {@link Unsafe} from
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMEventListener.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMEventListener.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.hotspot; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.JVMCIMetaAccessContext; +import jdk.internal.jvmci.meta.ResolvedJavaType; public interface HotSpotVMEventListener {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVmSymbols.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVmSymbols.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,9 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.*; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; -import sun.misc.*; +import sun.misc.Unsafe; /** * Class to access the C++ {@code vmSymbols} table.
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/Stable.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/Stable.java Wed Sep 16 13:40:05 2015 +0200 @@ -23,7 +23,10 @@ package jdk.internal.jvmci.hotspot; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * This annotation functions as an alias for the sun.invoke.Stable annotation within JVMCI code. It
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/events/EmptyEventProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/events/EmptyEventProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.hotspot.events; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; /** * An empty implementation for {@link EventProvider}. This implementation is used when no logging is
--- a/jvmci/jdk.internal.jvmci.hotspotvmconfig.processor/src/jdk/internal/jvmci/hotspotvmconfig/processor/HotSpotVMConfigProcessor.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspotvmconfig.processor/src/jdk/internal/jvmci/hotspotvmconfig/processor/HotSpotVMConfigProcessor.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,20 +22,37 @@ */ package jdk.internal.jvmci.hotspotvmconfig.processor; -import java.io.*; -import java.lang.annotation.*; -import java.util.*; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; import java.util.Map.Entry; -import java.util.function.*; +import java.util.Set; +import java.util.function.BiFunction; -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Filer; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; import javax.tools.Diagnostic.Kind; -import javax.tools.*; +import javax.tools.FileObject; +import javax.tools.StandardLocation; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspotvmconfig.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMConstant; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMField; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMFlag; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMType; +import jdk.internal.jvmci.hotspotvmconfig.HotSpotVMValue; @SupportedAnnotationTypes({ // @formatter:off
--- a/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.hotspotvmconfig; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Refers to a C++ constant in the VM.
--- a/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMField.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.hotspotvmconfig; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Refers to a C++ field in the VM.
--- a/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMFlag.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMFlag.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.hotspotvmconfig; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Refers to a C++ flag in the VM.
--- a/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.hotspotvmconfig; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Refers to a C++ type in the VM.
--- a/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspotvmconfig/src/jdk/internal/jvmci/hotspotvmconfig/HotSpotVMValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.hotspotvmconfig; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME)
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/Assumptions.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/Assumptions.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,12 @@ */ package jdk.internal.jvmci.meta; -import java.lang.invoke.*; -import java.util.*; +import java.lang.invoke.CallSite; +import java.lang.invoke.MethodHandle; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * Class for recording assumptions made during compilation.
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ConstantReflectionProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ConstantReflectionProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.lang.invoke.*; +import java.lang.invoke.MethodHandle; /** * Reflection operations on values represented as {@linkplain JavaConstant constants}. All methods
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ExceptionHandler.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ExceptionHandler.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.Objects; /** * Represents an exception handler within the bytecodes.
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaField.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.IllegalFormatException; +import java.util.UnknownFormatConversionException; /** * Represents a reference to a Java field, either resolved or unresolved fields. Fields, like
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaKind.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaKind.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.lang.reflect.*; +import java.lang.reflect.Array; //JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaMethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaMethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.IllegalFormatException; +import java.util.UnknownFormatConversionException; /** * Represents a reference to a Java method, either resolved or unresolved. Methods, like fields and
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaMethodProfile.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaMethodProfile.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import jdk.internal.jvmci.meta.JavaMethodProfile.*; +import jdk.internal.jvmci.meta.JavaMethodProfile.ProfiledMethod; /** * This profile object represents the method profile at a specific BCI. The precision of the
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static jdk.internal.jvmci.meta.MetaUtil.internalNameToJava; /** * Represents a resolved or unresolved type. Types include primitives, objects, {@code void}, and
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaTypeProfile.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/JavaTypeProfile.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,9 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.ArrayList; -import jdk.internal.jvmci.meta.JavaTypeProfile.*; +import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; /** * This profile object represents the type profile at a specific BCI. The precision of the supplied
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/LIRKind.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/LIRKind.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.ArrayList; /** * Represents the type of values in the LIR. It is composed of a {@link PlatformKind} that gives the
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/LocalVariableTableImpl.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/LocalVariableTableImpl.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,8 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.ArrayList; +import java.util.List; public class LocalVariableTableImpl implements LocalVariableTable {
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/LocationIdentity.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/LocationIdentity.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; +import java.util.IdentityHashMap; // JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/MetaAccessProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/MetaAccessProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.meta; -import java.lang.reflect.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Executable; +import java.lang.reflect.Field; +import java.lang.reflect.Method; /** * Provides access to the metadata of a class typically provided in a class file.
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/MetaUtil.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/MetaUtil.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,17 @@ */ package jdk.internal.jvmci.meta; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.io.PrintStream; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; /** * Miscellaneous collection of utility methods used by {@code jdk.internal.jvmci.meta} and its
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/MethodHandleAccessProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/MethodHandleAccessProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.lang.invoke.*; +import java.lang.invoke.MethodHandle; /** * Interface to access the internals of the {@link MethodHandle} implementation of the VM. An
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ModifiersProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ModifiersProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,20 @@ */ package jdk.internal.jvmci.meta; -import static java.lang.reflect.Modifier.*; +import static java.lang.reflect.Modifier.ABSTRACT; +import static java.lang.reflect.Modifier.FINAL; +import static java.lang.reflect.Modifier.INTERFACE; +import static java.lang.reflect.Modifier.NATIVE; +import static java.lang.reflect.Modifier.PRIVATE; +import static java.lang.reflect.Modifier.PROTECTED; +import static java.lang.reflect.Modifier.PUBLIC; +import static java.lang.reflect.Modifier.STATIC; +import static java.lang.reflect.Modifier.STRICT; +import static java.lang.reflect.Modifier.SYNCHRONIZED; +import static java.lang.reflect.Modifier.TRANSIENT; +import static java.lang.reflect.Modifier.VOLATILE; -import java.lang.reflect.*; +import java.lang.reflect.Modifier; /** * A Java element (i.e., a class, interface, field or method) that is described by a set of Java
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/PrimitiveConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/PrimitiveConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.nio.*; +import java.nio.ByteBuffer; /** * Represents a primitive constant value, such as an integer or floating point number, within the
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ResolvedJavaField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ResolvedJavaField.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,8 @@ */ package jdk.internal.jvmci.meta; -import java.lang.annotation.*; -import java.lang.reflect.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Modifier; /** * Represents a reference to a resolved Java field. Fields, like methods and types, are resolved
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ResolvedJavaMethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ResolvedJavaMethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,12 @@ */ package jdk.internal.jvmci.meta; -import java.lang.annotation.*; -import java.lang.invoke.*; -import java.lang.reflect.*; +import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; /** * Represents a resolved Java method. Methods, like fields and types, are resolved through
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ResolvedJavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/ResolvedJavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,10 @@ */ package jdk.internal.jvmci.meta; -import java.lang.annotation.*; -import java.net.*; +import java.lang.annotation.Annotation; +import java.net.URL; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; /** * Represents a resolved Java type. Types include primitives, objects, {@code void}, and arrays
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/SerializableConstant.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/SerializableConstant.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.meta; -import java.nio.*; +import java.nio.ByteBuffer; /** * Represents a compile-time constant that can be converted to a byte array.
--- a/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/SpeculationLog.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.meta/src/jdk/internal/jvmci/meta/SpeculationLog.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.meta; -import java.util.*; -import java.util.concurrent.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; /** * Manages a list of unique deoptimization reasons.
--- a/jvmci/jdk.internal.jvmci.options.processor/src/jdk/internal/jvmci/options/processor/OptionProcessor.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options.processor/src/jdk/internal/jvmci/options/processor/OptionProcessor.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,18 +22,40 @@ */ package jdk.internal.jvmci.options.processor; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Filer; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.Elements; +import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import javax.tools.*; +import javax.tools.JavaFileObject; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.internal.jvmci.options.OptionDescriptors; +import jdk.internal.jvmci.options.OptionValue; /** * Processes static fields annotated with {@link Option}. An {@link OptionDescriptors}
--- a/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/NestedBooleanOptionValueTest.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/NestedBooleanOptionValueTest.java Wed Sep 16 13:40:05 2015 +0200 @@ -28,12 +28,20 @@ package jdk.internal.jvmci.options.test; -import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.*; -import static org.junit.Assert.*; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.Master0; +import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.Master1; +import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.Master2; +import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.NestedOption0; +import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.NestedOption1; +import static jdk.internal.jvmci.options.test.NestedBooleanOptionValueTest.Options.NestedOption2; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import jdk.internal.jvmci.options.NestedBooleanOptionValue; +import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import org.junit.*; +import org.junit.Test; public class NestedBooleanOptionValueTest {
--- a/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/TestOptionValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options.test/src/jdk/internal/jvmci/options/test/TestOptionValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -28,15 +28,21 @@ package jdk.internal.jvmci.options.test; -import static jdk.internal.jvmci.options.test.TestOptionValue.Options.*; -import static org.junit.Assert.*; - -import java.util.*; +import static jdk.internal.jvmci.options.test.TestOptionValue.Options.Mutable; +import static jdk.internal.jvmci.options.test.TestOptionValue.Options.SecondMutable; +import static jdk.internal.jvmci.options.test.TestOptionValue.Options.Stable; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import java.util.Arrays; -import org.junit.*; +import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.internal.jvmci.options.StableOptionValue; + +import org.junit.Test; @SuppressWarnings("try") public class TestOptionValue {
--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/DerivedOptionValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/DerivedOptionValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,10 @@ */ package jdk.internal.jvmci.options; -import java.io.*; -import java.util.function.*; +import java.io.Serializable; +import java.util.function.Supplier; -import jdk.internal.jvmci.options.OptionValue.*; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; /** * A cached value that needs to be recomputed when an option changes.
--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/JVMCIJarsOptionDescriptorsProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/JVMCIJarsOptionDescriptorsProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,12 +22,17 @@ */ package jdk.internal.jvmci.options; -import java.io.*; -import java.util.*; -import java.util.jar.*; -import java.util.zip.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.jar.JarFile; +import java.util.zip.ZipEntry; -import jdk.internal.jvmci.options.OptionsParser.*; +import jdk.internal.jvmci.options.OptionsParser.OptionDescriptorsProvider; /** * Access to the {@link OptionDescriptors} declared by
--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/Option.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/Option.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.options; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Describes the attributes of an option whose {@link OptionValue value} is in a static field
--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionValue.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionValue.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,15 @@ */ package jdk.internal.jvmci.options; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; /** * An option value.
--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionsLoader.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionsLoader.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,9 @@ */ package jdk.internal.jvmci.options; -import java.util.*; +import java.util.ServiceLoader; +import java.util.SortedMap; +import java.util.TreeMap; /** * Helper class used to load option descriptors. Only to be used in the slow-path.
--- a/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionsParser.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.options/src/jdk/internal/jvmci/options/OptionsParser.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,12 +22,22 @@ */ package jdk.internal.jvmci.options; -import static jdk.internal.jvmci.inittimer.InitTimer.*; +import static jdk.internal.jvmci.inittimer.InitTimer.timer; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Formatter; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.SortedMap; -import jdk.internal.jvmci.inittimer.*; +import jdk.internal.jvmci.inittimer.InitTimer; /** * This class contains methods for parsing JVMCI options and matching them against a set of
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/ConstantTest.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/ConstantTest.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,9 +29,11 @@ package jdk.internal.jvmci.runtime.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; public class ConstantTest extends FieldUniverse {
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/FieldUniverse.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/FieldUniverse.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,11 @@ */ package jdk.internal.jvmci.runtime.test; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaField; /** * Context for field related tests.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/MethodUniverse.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/MethodUniverse.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,10 +22,12 @@ */ package jdk.internal.jvmci.runtime.test; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; /** * Context for method related tests.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/NameAndSignature.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/NameAndSignature.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,11 +22,14 @@ */ package jdk.internal.jvmci.runtime.test; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Method; +import java.util.Arrays; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; +import jdk.internal.jvmci.runtime.JVMCI; class NameAndSignature {
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/RedefineClassTest.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/RedefineClassTest.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,22 +22,31 @@ */ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeTrue; -import java.io.*; -import java.lang.instrument.*; -import java.lang.management.*; -import java.lang.reflect.*; -import java.nio.file.*; -import java.security.*; -import java.util.*; -import java.util.jar.*; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.instrument.ClassFileTransformer; +import java.lang.instrument.IllegalClassFormatException; +import java.lang.instrument.Instrumentation; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Method; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.ProtectionDomain; +import java.util.Arrays; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; -import javax.tools.*; +import javax.tools.ToolProvider; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; /** * Tests that {@link ResolvedJavaMethod}s are safe in the context of class redefinition being used
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,11 +22,14 @@ */ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.runtime.JVMCI; -import org.junit.*; +import org.junit.Test; public class ResolvedJavaTypeResolveConcreteMethodTest { public final MetaAccessProvider metaAccess;
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/ResolvedJavaTypeResolveMethodTest.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/ResolvedJavaTypeResolveMethodTest.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,11 +22,14 @@ */ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.runtime.JVMCI; -import org.junit.*; +import org.junit.Test; public class ResolvedJavaTypeResolveMethodTest { public final MetaAccessProvider metaAccess;
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestConstantReflectionProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestConstantReflectionProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,14 +22,20 @@ */ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import org.junit.*; +import org.junit.Test; /** * Tests for {@link ConstantReflectionProvider}. It assumes an implementation of the interface that
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestJavaField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestJavaField.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,14 +29,19 @@ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.Field; +import java.util.Map; -import java.lang.reflect.*; -import java.util.*; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Test; /** * Tests for {@link JavaField}.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestJavaMethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestJavaMethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,14 +29,17 @@ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.Method; +import java.util.Map; -import java.lang.reflect.*; -import java.util.*; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Test; /** * Tests for {@link JavaMethod}.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestJavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestJavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,10 +29,11 @@ package jdk.internal.jvmci.runtime.test; -import jdk.internal.jvmci.meta.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; -import org.junit.*; +import org.junit.Test; /** * Tests for {@link JavaType}.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestMetaAccessProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestMetaAccessProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,14 +29,22 @@ package jdk.internal.jvmci.runtime.test; -import static jdk.internal.jvmci.meta.MetaUtil.*; -import static org.junit.Assert.*; +import static jdk.internal.jvmci.meta.MetaUtil.toInternalName; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; -import java.lang.reflect.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Test; /** * Tests for {@link MetaAccessProvider}.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestResolvedJavaField.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestResolvedJavaField.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,15 +29,27 @@ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; /** * Tests for {@link ResolvedJavaField}.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestResolvedJavaMethod.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestResolvedJavaMethod.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,16 +29,35 @@ package jdk.internal.jvmci.runtime.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -import java.lang.annotation.*; -import java.lang.invoke.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Constructor; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantPool; +import jdk.internal.jvmci.meta.ExceptionHandler; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; /** * Tests for {@link ResolvedJavaMethod}.
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestResolvedJavaType.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TestResolvedJavaType.java Wed Sep 16 13:40:05 2015 +0200 @@ -29,19 +29,42 @@ package jdk.internal.jvmci.runtime.test; -import static java.lang.reflect.Modifier.*; -import static org.junit.Assert.*; +import static java.lang.reflect.Modifier.isAbstract; +import static java.lang.reflect.Modifier.isFinal; +import static java.lang.reflect.Modifier.isPrivate; +import static java.lang.reflect.Modifier.isProtected; +import static java.lang.reflect.Modifier.isPublic; +import static java.lang.reflect.Modifier.isStatic; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.net.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ModifiersProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TrustedInterface; -import org.junit.*; +import org.junit.Test; import sun.reflect.ConstantPool;
--- a/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TypeUniverse.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime.test/src/jdk/internal/jvmci/runtime/test/TypeUniverse.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,20 +22,42 @@ */ package jdk.internal.jvmci.runtime.test; -import static java.lang.reflect.Modifier.*; +import static java.lang.reflect.Modifier.isFinal; +import static java.lang.reflect.Modifier.isStatic; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.io.Serializable; +import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.AbstractCollection; +import java.util.AbstractList; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Queue; -import java.util.stream.*; +import java.util.Set; +import java.util.TreeMap; +import java.util.stream.Collectors; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TrustedInterface; +import jdk.internal.jvmci.runtime.JVMCI; -import org.junit.*; +import org.junit.Test; -import sun.misc.*; +import sun.misc.Unsafe; //JaCoCo Exclude
--- a/jvmci/jdk.internal.jvmci.runtime/src/jdk/internal/jvmci/runtime/JVMCI.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime/src/jdk/internal/jvmci/runtime/JVMCI.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.runtime; -import java.util.*; +import java.util.Formatter; public class JVMCI {
--- a/jvmci/jdk.internal.jvmci.runtime/src/jdk/internal/jvmci/runtime/JVMCIBackend.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime/src/jdk/internal/jvmci/runtime/JVMCIBackend.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,8 +22,10 @@ */ package jdk.internal.jvmci.runtime; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; /** * A JVMCI backend encapsulates the capabilities needed by a Java based compiler for compiling and
--- a/jvmci/jdk.internal.jvmci.runtime/src/jdk/internal/jvmci/runtime/JVMCIRuntime.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.runtime/src/jdk/internal/jvmci/runtime/JVMCIRuntime.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.runtime; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Architecture; /** * Interface for accessing the {@link JVMCI} APIs supported by the runtime.
--- a/jvmci/jdk.internal.jvmci.service.processor/src/jdk/internal/jvmci/service/processor/ServiceProviderProcessor.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.service.processor/src/jdk/internal/jvmci/service/processor/ServiceProviderProcessor.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,17 +22,25 @@ */ package jdk.internal.jvmci.service.processor; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.HashSet; +import java.util.Set; -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.MirroredTypeException; +import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; -import javax.tools.*; +import javax.tools.FileObject; +import javax.tools.StandardLocation; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.ServiceProvider; @SupportedAnnotationTypes("jdk.internal.jvmci.service.ServiceProvider") public class ServiceProviderProcessor extends AbstractProcessor {
--- a/jvmci/jdk.internal.jvmci.service/.checkstyle_checks.xml Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.service/.checkstyle_checks.xml Wed Sep 16 13:40:05 2015 +0200 @@ -32,6 +32,10 @@ <module name="NoWhitespaceAfter"> <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/> </module> + <module name="AvoidStarImport"> + <property name="allowClassImports" value="false"/> + <property name="allowStaticMemberImports" value="false"/> + </module> <module name="NoWhitespaceBefore"> <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/> </module>
--- a/jvmci/jdk.internal.jvmci.service/src/jdk/internal/jvmci/service/JVMCIClassLoaderFactory.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.service/src/jdk/internal/jvmci/service/JVMCIClassLoaderFactory.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,12 @@ */ package jdk.internal.jvmci.service; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; /** * Utility called from the VM to create and register a separate class loader for loading JVMCI
--- a/jvmci/jdk.internal.jvmci.service/src/jdk/internal/jvmci/service/ServiceProvider.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.service/src/jdk/internal/jvmci/service/ServiceProvider.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,7 +22,10 @@ */ package jdk.internal.jvmci.service; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotates a service provider than can be loaded via {@linkplain Services#load(Class)} or
--- a/jvmci/jdk.internal.jvmci.service/src/jdk/internal/jvmci/service/Services.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.service/src/jdk/internal/jvmci/service/Services.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,9 +22,12 @@ */ package jdk.internal.jvmci.service; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Formatter; +import java.util.List; -import sun.reflect.*; +import sun.reflect.Reflection; /** * An mechanism for accessing service providers via JVMCI. These providers are loaded via a JVMCI
--- a/jvmci/jdk.internal.jvmci.sparc/src/jdk/internal/jvmci/sparc/SPARC.java Wed Sep 16 13:20:35 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.sparc/src/jdk/internal/jvmci/sparc/SPARC.java Wed Sep 16 13:40:05 2015 +0200 @@ -22,14 +22,19 @@ */ package jdk.internal.jvmci.sparc; -import static java.nio.ByteOrder.*; -import static jdk.internal.jvmci.code.MemoryBarriers.*; +import static java.nio.ByteOrder.BIG_ENDIAN; +import static jdk.internal.jvmci.code.MemoryBarriers.LOAD_LOAD; +import static jdk.internal.jvmci.code.MemoryBarriers.LOAD_STORE; +import static jdk.internal.jvmci.code.MemoryBarriers.STORE_STORE; + +import java.util.Set; -import java.util.*; - -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.Register; import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.PlatformKind; /** * Represents the SPARC architecture.