Mercurial > hg > graal-compiler
changeset 22646:05183a084a08
updated imports to be explicit and added checkstyle rule to forbid * imports
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.collections/src/com/oracle/graal/api/collections/CollectionsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.collections/src/com/oracle/graal/api/collections/CollectionsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.api.collections; -import java.util.*; +import java.util.Map; +import java.util.Set; /** * A factory for creating collections.
--- a/graal/com.oracle.graal.api.collections/src/com/oracle/graal/api/collections/DefaultCollectionsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.collections/src/com/oracle/graal/api/collections/DefaultCollectionsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.api.collections; -import java.util.*; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Map; +import java.util.Set; /** * A default implementation of {@link CollectionsProvider} that creates standard JDK collection
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/BlackholeDirectiveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/BlackholeDirectiveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.api.directives.test; -import java.lang.annotation.*; - -import org.junit.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import org.junit.Assert; +import org.junit.Test; + +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; /** * Tests for {@link GraalDirectives#blackhole}.
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,29 @@ */ package com.oracle.graal.api.directives.test; -import java.lang.annotation.*; -import java.util.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.debug.*; +import org.junit.Assert; +import org.junit.Test; + +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.debug.ControlFlowAnchorNode; public class ControlFlowAnchorDirectiveTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/DeoptimizeDirectiveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/DeoptimizeDirectiveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.api.directives.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; public class DeoptimizeDirectiveTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/IterationDirectiveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/IterationDirectiveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.api.directives.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.StructuredGraph; public class IterationDirectiveTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/OpaqueDirectiveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/OpaqueDirectiveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.api.directives.test; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.ConditionalNode; /** * Tests for {@link GraalDirectives#opaque}.
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/ProbabilityDirectiveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/ProbabilityDirectiveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.api.directives.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.StructuredGraph; public class ProbabilityDirectiveTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/ClassSubstitution.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/ClassSubstitution.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.api.replacements; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Denotes a class that substitutes methods of another specified class. The substitute methods are
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/Fold.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/Fold.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.api.replacements; -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 method replaced by a compile-time constant. A (resolved) call to the annotated method
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/MethodSubstitution.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/MethodSubstitution.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.api.replacements; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Signature; /** * Denotes a substitute method. A substitute method can call the original/substituted method by
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,19 @@ */ package com.oracle.graal.api.replacements; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Reflection operations on values represented as {@linkplain JavaConstant constants} for the
--- a/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.api.runtime; -import java.util.*; +import java.util.Formatter; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.Services; /** * Access point for {@linkplain #getRuntime() retrieving} the single {@link GraalRuntime} instance.
--- a/graal/com.oracle.graal.api.test/src/com/oracle/graal/api/test/GraalAPITest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.api.test/src/com/oracle/graal/api/test/GraalAPITest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.api.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.runtime.*; +import com.oracle.graal.api.runtime.Graal; public class GraalAPITest {
--- a/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/SimpleAssemblerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/SimpleAssemblerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,29 @@ */ package com.oracle.graal.asm.amd64.test; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.test.*; +import static org.junit.Assume.assumeTrue; -import static org.junit.Assume.*; - -import java.nio.*; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; -import jdk.internal.jvmci.amd64.*; -import 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.amd64.AMD64; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; +import jdk.internal.jvmci.code.DataSection.Data; +import jdk.internal.jvmci.code.DataSection.DataBuilder; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; + +import com.oracle.graal.asm.amd64.AMD64Assembler; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.asm.test.AssemblerTest; public class SimpleAssemblerTest extends AssemblerTest {
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Address.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Address.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.asm.amd64; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.AbstractAddress; +import jdk.internal.jvmci.code.Register; /** * Represents an address in target machine memory, specified via some combination of a base
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,44 @@ */ package com.oracle.graal.asm.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.amd64.AMD64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.Register.*; - -import com.oracle.graal.asm.*; +import static com.oracle.graal.asm.NumUtil.isByte; +import static com.oracle.graal.asm.NumUtil.isInt; +import static com.oracle.graal.asm.NumUtil.isShiftCount; +import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseAddressNop; +import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseNormalNop; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.DEC; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.INC; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.BYTE; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.PD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.PS; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SS; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.WORD; +import static jdk.internal.jvmci.amd64.AMD64.CPU; +import static jdk.internal.jvmci.amd64.AMD64.XMM; +import static jdk.internal.jvmci.amd64.AMD64.r12; +import static jdk.internal.jvmci.amd64.AMD64.r13; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.amd64.AMD64.rip; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import static jdk.internal.jvmci.code.MemoryBarriers.STORE_LOAD; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.amd64.AMD64.CPUFeature; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.Register.RegisterCategory; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; -import static com.oracle.graal.asm.NumUtil.*; -import static com.oracle.graal.asm.amd64.AMD64AsmOptions.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.MemoryBarriers.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.Label; +import com.oracle.graal.asm.NumUtil; /** * This class implements an assembler that can encode most X86 instructions.
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64MacroAssembler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64MacroAssembler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.asm.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseIncDec; +import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseXmmLoadAndClearUpper; +import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseXmmRegToRegMoveAll; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.asm.*; - -import static com.oracle.graal.asm.amd64.AMD64AsmOptions.*; +import com.oracle.graal.asm.NumUtil; /** * This class implements commonly used X86 code patterns.
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAddress.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAddress.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.asm.sparc; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.sparc.*; +import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS; +import static jdk.internal.jvmci.sparc.SPARC.fp; +import static jdk.internal.jvmci.sparc.SPARC.sp; +import jdk.internal.jvmci.code.AbstractAddress; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.sparc.SPARC; public class SPARCAddress extends AbstractAddress {
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,133 @@ */ package com.oracle.graal.asm.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Ops.*; -import static java.lang.String.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Icc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Always; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Add; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Addc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Addcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.And; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Andcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Andn; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Andncc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Casa; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Casxa; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Fcmp; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Flushw; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Fpop1; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Fpop2; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Impdep1; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Jmpl; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Lddf; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldf; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldsb; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldsh; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldsw; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldub; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Lduh; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Lduw; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Lduwa; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Ldxa; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Membar; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Movcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Mulx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Or; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Popc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Prefetch; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Rd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Restore; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Save; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Sdivx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Sll; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Sllx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Sra; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Srax; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Srl; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Srlx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Stb; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Stdf; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Stf; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Sth; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Stw; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Stx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Stxa; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Sub; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Subcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Udivx; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Wr; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Xnor; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Xor; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Op3s.Xorcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fabsd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fabss; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Faddd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Faddq; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fadds; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fandd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fdivd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fdivs; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fdtoi; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fdtos; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fdtox; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fitod; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fitos; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fmovd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fmovdcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fmovs; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fmovscc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fmuld; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fmuls; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fnegd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fnegs; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fpadd32; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsmuld; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsqrtd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsqrts; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsrc2d; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsrc2s; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fstod; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fstoi; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fstox; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsubd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fsubs; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fxtod; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fxtos; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fzerod; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fzeros; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Movdtox; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Movstosw; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Movwtos; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Movxtod; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.UMulxhi; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Ops.ArithOp; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Ops.LdstOp; +import static java.lang.String.format; +import static jdk.internal.jvmci.sparc.SPARC.INSTRUCTION_SIZE; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import static jdk.internal.jvmci.sparc.SPARC.isCPURegister; +import static jdk.internal.jvmci.sparc.SPARC.isDoubleFloatRegister; +import static jdk.internal.jvmci.sparc.SPARC.isSingleFloatRegister; +import static jdk.internal.jvmci.sparc.SPARC.r15; +import static jdk.internal.jvmci.sparc.SPARC.r2; +import static jdk.internal.jvmci.sparc.SPARC.r5; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.sparc.SPARC; import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.Label; +import com.oracle.graal.asm.NumUtil; /** * This class implements an assembler that can encode most SPARC instructions.
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCInstructionCounter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCInstructionCounter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.asm.sparc; -import java.util.*; +import java.util.TreeMap; -import com.oracle.graal.asm.Assembler.*; +import com.oracle.graal.asm.Assembler.InstructionCounter; public class SPARCInstructionCounter implements InstructionCounter { // Use a treemap to keep the order in the output
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,29 @@ */ package com.oracle.graal.asm.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.RCondition.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL; +import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_NOT_TAKEN; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Icc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Xcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Always; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Equal; +import static com.oracle.graal.asm.sparc.SPARCAssembler.RCondition.Rc_z; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import static jdk.internal.jvmci.sparc.SPARC.g3; +import static jdk.internal.jvmci.sparc.SPARC.i7; +import static jdk.internal.jvmci.sparc.SPARC.isCPURegister; +import static jdk.internal.jvmci.sparc.SPARC.o7; -import java.util.function.*; +import java.util.function.Consumer; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.AbstractAddress; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.sparc.SPARC; import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.Label; public class SPARCMacroAssembler extends SPARCAssembler {
--- a/graal/com.oracle.graal.asm.test/src/com/oracle/graal/asm/test/AssemblerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm.test/src/com/oracle/graal/asm/test/AssemblerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,28 @@ */ package com.oracle.graal.asm.test; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.runtime.JVMCI; +import jdk.internal.jvmci.runtime.JVMCIBackend; +import jdk.internal.jvmci.service.Services; -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.code.*; -import com.oracle.graal.test.*; +import com.oracle.graal.code.DisassemblerProvider; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.test.GraalTest; public abstract class AssemblerTest extends GraalTest {
--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,16 @@ */ package com.oracle.graal.asm; -import java.nio.*; -import java.util.*; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.AbstractAddress; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; /** * The platform-independent base class for the assembler.
--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Buffer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Buffer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.asm; -import java.util.*; +import java.util.Arrays; /** * Code buffer management for the assembler. Support for little endian and big endian architectures
--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Label.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Label.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.asm; -import java.util.*; +import java.util.ArrayList; /** * This class represents a label within assembly code.
--- a/graal/com.oracle.graal.bytecode/src/com/oracle/graal/bytecode/Bytecodes.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.bytecode/src/com/oracle/graal/bytecode/Bytecodes.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,20 @@ */ package com.oracle.graal.bytecode; -import static com.oracle.graal.bytecode.Bytecodes.Flags.*; +import static com.oracle.graal.bytecode.Bytecodes.Flags.ASSOCIATIVE; +import static com.oracle.graal.bytecode.Bytecodes.Flags.BRANCH; +import static com.oracle.graal.bytecode.Bytecodes.Flags.COMMUTATIVE; +import static com.oracle.graal.bytecode.Bytecodes.Flags.FALL_THROUGH; +import static com.oracle.graal.bytecode.Bytecodes.Flags.FIELD_READ; +import static com.oracle.graal.bytecode.Bytecodes.Flags.FIELD_WRITE; +import static com.oracle.graal.bytecode.Bytecodes.Flags.INVOKE; +import static com.oracle.graal.bytecode.Bytecodes.Flags.LOAD; +import static com.oracle.graal.bytecode.Bytecodes.Flags.STOP; +import static com.oracle.graal.bytecode.Bytecodes.Flags.STORE; +import static com.oracle.graal.bytecode.Bytecodes.Flags.TRAP; -import java.lang.reflect.*; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; /** * Definitions of the standard Java bytecodes defined by <a href=
--- a/graal/com.oracle.graal.code/src/com/oracle/graal/code/DisassemblerProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.code/src/com/oracle/graal/code/DisassemblerProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.code; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; /** * Interface providing capability for disassembling machine code.
--- a/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFile.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFile.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,20 @@ */ package com.oracle.graal.code; -import java.io.*; -import java.util.*; -import java.util.regex.*; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CompilationResult.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.CompilationResult.CodeAnnotation; +import jdk.internal.jvmci.code.CompilationResult.CodeComment; +import jdk.internal.jvmci.code.CompilationResult.JumpTable; /** * A HexCodeFile is a textual format for representing a chunk of machine code along with extra
--- a/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFileDisassemblerProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFileDisassemblerProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,24 @@ */ package com.oracle.graal.code; -import java.lang.invoke.*; -import java.util.*; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CodeUtil.*; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.CodeUtil.DefaultRefMapFormatter; +import jdk.internal.jvmci.code.CodeUtil.RefMapFormatter; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.CompilationResult.Call; +import jdk.internal.jvmci.code.CompilationResult.DataPatch; +import jdk.internal.jvmci.code.CompilationResult.Infopoint; +import jdk.internal.jvmci.code.CompilationResult.Mark; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.service.ServiceProvider; /** * {@link HexCodeFile} based implementation of {@link DisassemblerProvider}.
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.compiler.amd64.test; -import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static org.junit.Assume.*; -import jdk.internal.jvmci.amd64.*; +import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.TraceRA; +import static com.oracle.graal.compiler.common.GraalOptions.RegisterPressure; +import static org.junit.Assume.assumeTrue; +import jdk.internal.jvmci.amd64.AMD64; -import org.junit.*; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.compiler.test.backend.*; +import com.oracle.graal.compiler.test.backend.AllocatorTest; public class AMD64AllocatorTest extends AllocatorTest {
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/ConstantStackMoveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/ConstantStackMoveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.compiler.amd64.test; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeTrue; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.jtt.*; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.jtt.LIRTest; +import com.oracle.graal.lir.jtt.LIRTestSpecification; public class ConstantStackMoveTest extends LIRTest { @Before
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/StackStoreTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/StackStoreTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.compiler.amd64.test; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeTrue; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.jtt.*; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.jtt.LIRTest; +import com.oracle.graal.lir.jtt.LIRTestSpecification; public class StackStoreTest extends LIRTest { @Before
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressLowering.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressLowering.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,15 +23,17 @@ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address.Scale; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.LeftShiftNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.memory.address.AddressNode; import com.oracle.graal.phases.common.AddressLoweringPhase.AddressLowering; public class AMD64AddressLowering extends AddressLowering {
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,16 +23,19 @@ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address.Scale; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.amd64.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.amd64.AMD64AddressValue; import com.oracle.graal.lir.gen.LIRGeneratorTool; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Represents an address of the form [base + index*scale + displacement]. Both base and index are
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,24 +23,78 @@ package com.oracle.graal.compiler.amd64; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64Shift.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static com.oracle.graal.lir.amd64.AMD64Arithmetic.*; -import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.NEG; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.NOT; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.BSF; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.BSR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSS; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZX; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZXB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.POPCNT; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TEST; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TESTB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROL; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64Shift.SAR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64Shift.SHL; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64Shift.SHR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.BYTE; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.PD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.PS; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SS; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.WORD; +import static com.oracle.graal.lir.LIRValueUtil.asConstantValue; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.amd64.AMD64Arithmetic.DREM; +import static com.oracle.graal.lir.amd64.AMD64Arithmetic.FREM; +import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.COS; +import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.LOG; +import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.LOG10; +import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.SIN; +import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.TAN; +import static jdk.internal.jvmci.code.ValueUtil.isAllocatableValue; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp; @@ -51,13 +105,28 @@ import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag; import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; import com.oracle.graal.asm.amd64.AMD64Assembler.SSEOp; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.calc.FloatConvert; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.spi.LIRKindTool; +import com.oracle.graal.compiler.common.util.Util; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRValueUtil; +import com.oracle.graal.lir.LabelRef; import com.oracle.graal.lir.StandardOp.JumpOp; -import com.oracle.graal.lir.amd64.*; +import com.oracle.graal.lir.SwitchStrategy; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.amd64.AMD64AddressValue; import com.oracle.graal.lir.amd64.AMD64Arithmetic.FPDivRemOp; +import com.oracle.graal.lir.amd64.AMD64ArithmeticLIRGenerator; +import com.oracle.graal.lir.amd64.AMD64ArrayEqualsOp; +import com.oracle.graal.lir.amd64.AMD64Binary; +import com.oracle.graal.lir.amd64.AMD64BinaryConsumer; +import com.oracle.graal.lir.amd64.AMD64ByteSwapOp; +import com.oracle.graal.lir.amd64.AMD64Call; +import com.oracle.graal.lir.amd64.AMD64ClearRegisterOp; import com.oracle.graal.lir.amd64.AMD64ControlFlow.BranchOp; import com.oracle.graal.lir.amd64.AMD64ControlFlow.CondMoveOp; import com.oracle.graal.lir.amd64.AMD64ControlFlow.FloatBranchOp; @@ -65,6 +134,9 @@ import com.oracle.graal.lir.amd64.AMD64ControlFlow.ReturnOp; import com.oracle.graal.lir.amd64.AMD64ControlFlow.StrategySwitchOp; import com.oracle.graal.lir.amd64.AMD64ControlFlow.TableSwitchOp; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp; +import com.oracle.graal.lir.amd64.AMD64Move; import com.oracle.graal.lir.amd64.AMD64Move.AMD64PushPopStackMove; import com.oracle.graal.lir.amd64.AMD64Move.AMD64StackMove; import com.oracle.graal.lir.amd64.AMD64Move.CompareAndSwapOp; @@ -75,9 +147,15 @@ import com.oracle.graal.lir.amd64.AMD64Move.MoveFromRegOp; import com.oracle.graal.lir.amd64.AMD64Move.MoveToRegOp; import com.oracle.graal.lir.amd64.AMD64Move.StackLeaOp; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.lir.amd64.AMD64MulDivOp; +import com.oracle.graal.lir.amd64.AMD64ShiftOp; +import com.oracle.graal.lir.amd64.AMD64SignExtendOp; +import com.oracle.graal.lir.amd64.AMD64Unary; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGenerator; +import com.oracle.graal.lir.gen.SpillMoveFactoryBase; +import com.oracle.graal.phases.util.Providers; /** * This class implements the AMD64 specific portion of the LIR generator.
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,28 +23,70 @@ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.*; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SS; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +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 com.oracle.graal.asm.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.match.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64Assembler.SSEOp; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; +import com.oracle.graal.compiler.match.ComplexMatchResult; +import com.oracle.graal.compiler.match.MatchRule; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.amd64.AMD64AddressValue; +import com.oracle.graal.lir.amd64.AMD64BinaryConsumer; +import com.oracle.graal.lir.amd64.AMD64BreakpointOp; +import com.oracle.graal.lir.amd64.AMD64Call; import com.oracle.graal.lir.amd64.AMD64ControlFlow.BranchOp; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodes.BreakpointNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.IndirectCallTargetNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.FixedBinaryNode; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.calc.IntegerDivNode; +import com.oracle.graal.nodes.calc.IntegerRemNode; +import com.oracle.graal.nodes.calc.LeftShiftNode; +import com.oracle.graal.nodes.calc.NarrowNode; +import com.oracle.graal.nodes.calc.ReinterpretNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.UnsignedRightShiftNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.extended.UnsafeCastNode; +import com.oracle.graal.nodes.memory.Access; +import com.oracle.graal.nodes.memory.WriteNode; public abstract class AMD64NodeLIRBuilder extends NodeLIRBuilder {
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64SuitesProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64SuitesProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.compiler.amd64; -import static com.oracle.graal.compiler.common.BackendOptions.*; +import static com.oracle.graal.compiler.common.BackendOptions.ShouldOptimizeStackToStackMoves; -import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.*; -import com.oracle.graal.java.*; -import com.oracle.graal.lir.amd64.phases.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.java.DefaultSuitesProvider; +import com.oracle.graal.lir.amd64.phases.StackMoveOptimizationPhase; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.phases.tiers.CompilerConfiguration; public class AMD64SuitesProvider extends DefaultSuitesProvider {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.compiler.common; -import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import jdk.internal.jvmci.options.*; +import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.LIREagerSSADestruction; +import jdk.internal.jvmci.options.DerivedOptionValue; import jdk.internal.jvmci.options.DerivedOptionValue.OptionSupplier; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; /** * Options to control the backend configuration. @@ -48,7 +50,7 @@ private static final long serialVersionUID = -7375589337502162545L; public Boolean get() { - return LIROptSSILinearScan.getValue() || TraceRA.getValue(); + return UserOptions.LIROptSSILinearScan.getValue() || UserOptions.TraceRA.getValue(); } }); @@ -57,7 +59,7 @@ private static final long serialVersionUID = 7657622005438210681L; public Boolean get() { - return SSA_LIR.getValue() || EnableSSIConstruction.getValue(); + return GraalOptions.SSA_LIR.getValue() || EnableSSIConstruction.getValue(); } }); @@ -71,10 +73,10 @@ private static final long serialVersionUID = 364925071685235153L; public LSRAVariant get() { - if (LIROptSSILinearScan.getValue()) { + if (UserOptions.LIROptSSILinearScan.getValue()) { return LSRAVariant.SSI_LSRA; } - if (SSA_LIR.getValue() && !LIREagerSSADestruction.getValue()) { + if (GraalOptions.SSA_LIR.getValue() && !LIREagerSSADestruction.getValue()) { return LSRAVariant.SSA_LSRA; } return LSRAVariant.NONSSA_LSAR; @@ -91,7 +93,7 @@ case SSI_LSRA: return true; } - if (TraceRA.getValue()) { + if (UserOptions.TraceRA.getValue()) { return true; } return false;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/CollectionsFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/CollectionsFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,16 @@ */ package com.oracle.graal.compiler.common; -import static com.oracle.graal.compiler.common.CollectionsFactory.Mode.*; +import static com.oracle.graal.compiler.common.CollectionsFactory.Mode.STANDARD; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; /** * Factory for creating collection objects used during compilation.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.compiler.common; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.StableOptionValue; /** * This class encapsulates options that control the behavior of the Graal compiler.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/LinkedIdentityHashMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/LinkedIdentityHashMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,16 @@ */ package com.oracle.graal.compiler.common; -import java.util.*; -import java.util.function.*; +import java.util.AbstractSet; +import java.util.Collection; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.Spliterator; +import java.util.Spliterators; +import java.util.function.Consumer; /** * A map that combines {@link IdentityHashMap} with {@link LinkedHashMap} for the purpose of
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/ComputeBlockOrder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/ComputeBlockOrder.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,14 @@ package com.oracle.graal.compiler.common.alloc; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Comparator; +import java.util.List; +import java.util.PriorityQueue; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.Loop; /** * Computes an ordering of the block that can be used by the linear scan register allocator and the
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/RegisterAllocationConfig.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/RegisterAllocationConfig.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.compiler.common.alloc; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.RegisterPressure; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.meta.PlatformKind; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.GraalOptions; /** * Configuration for register allocation. This is different to {@link RegisterConfig} as it only
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.compiler.common.alloc; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; +import java.util.PriorityQueue; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.Indent; public final class TraceBuilder<T extends AbstractBlockBase<T>> {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/Condition.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/Condition.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.compiler.common.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.UnsignedMath; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.PrimitiveConstant; /** * Condition codes used in conditionals.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.calc; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; public enum FloatConvert { F2I,
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlockBase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlockBase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.*; +import java.util.Collections; +import java.util.List; public abstract class AbstractBlockBase<T extends AbstractBlockBase<T>> {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractControlFlowGraph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractControlFlowGraph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,11 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; public interface AbstractControlFlowGraph<T extends AbstractBlockBase<T>> {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/CFGVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/CFGVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Deque; public class CFGVerifier {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/DominatorOptimizationProblem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/DominatorOptimizationProblem.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,11 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.*; -import java.util.stream.*; +import java.util.BitSet; +import java.util.EnumMap; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; /** * This class represents a dominator tree problem, i.e. a problem which can be solved by traversing
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/Loop.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/Loop.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,7 +23,8 @@ package com.oracle.graal.compiler.common.cfg; -import java.util.*; +import java.util.ArrayList; +import java.util.List; public abstract class Loop<T extends AbstractBlockBase<T>> {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableCFG.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableCFG.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.*; -import java.util.function.*; +import java.util.List; +import java.util.function.BiConsumer; /** * Represents a control-flow graph where each node can be annotated with arbitrary property pairs of
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableDominatorOptimizationProblem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableDominatorOptimizationProblem.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.function.*; +import java.util.function.BiConsumer; /** * A {@linkplain PrintableCFG printable} {@link DominatorOptimizationProblem}.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PropertyConsumable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PropertyConsumable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.cfg; -import java.util.function.*; +import java.util.function.BiConsumer; public interface PropertyConsumable {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/CodeGenProviders.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/CodeGenProviders.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; /** * A set of providers which are required for LIR and/or code generation. Some may not be present
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallDescriptor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallDescriptor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.spi; -import java.util.*; +import java.util.Arrays; /** * The name and signature of a foreign call. A foreign call differs from a normal compiled Java call
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallLinkage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallLinkage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.meta.InvokeTarget; +import jdk.internal.jvmci.meta.Value; /** * The runtime specific details of a {@linkplain ForeignCallDescriptor foreign} call.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; /** * Details about a set of supported {@link ForeignCallDescriptor foreign calls}.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/LIRKindTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/LIRKindTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; /** * This interface can be used to access platform and VM specific kinds.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractObjectStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractObjectStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,15 @@ */ package com.oracle.graal.compiler.common.type; -import java.util.*; +import java.util.AbstractList; +import java.util.Objects; +import java.util.RandomAccess; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Type describing all pointers to Java objects.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractPointerStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractPointerStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; /** * Abstract base class of all pointer types.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.compiler.common.type; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static jdk.internal.jvmci.meta.MetaUtil.getSimpleName; -import java.util.*; -import java.util.function.*; -import java.util.stream.*; +import java.util.Arrays; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.calc.*; +import com.oracle.graal.compiler.common.calc.FloatConvert; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Add; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.And; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Div;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.compiler.common.type; -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.SerializableConstant; /** * Type describing values that support arithmetic operations.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/FloatStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/FloatStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,27 @@ */ package com.oracle.graal.compiler.common.type; -import static com.oracle.graal.compiler.common.calc.FloatConvert.*; +import static com.oracle.graal.compiler.common.calc.FloatConvert.D2F; +import static com.oracle.graal.compiler.common.calc.FloatConvert.D2I; +import static com.oracle.graal.compiler.common.calc.FloatConvert.D2L; +import static com.oracle.graal.compiler.common.calc.FloatConvert.F2D; +import static com.oracle.graal.compiler.common.calc.FloatConvert.F2I; +import static com.oracle.graal.compiler.common.calc.FloatConvert.F2L; -import java.nio.*; -import java.util.function.*; +import java.nio.ByteBuffer; +import java.util.function.DoubleBinaryOperator; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.SerializableConstant; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.FloatConvertOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.UnaryOp;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IllegalStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IllegalStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,16 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; /** * This stamp represents the type of the {@link JavaKind#Illegal} value in the second slot of
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IntegerStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IntegerStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,26 @@ */ package com.oracle.graal.compiler.common.type; -import static com.oracle.graal.compiler.common.calc.FloatConvert.*; +import static com.oracle.graal.compiler.common.calc.FloatConvert.I2D; +import static com.oracle.graal.compiler.common.calc.FloatConvert.I2F; +import static com.oracle.graal.compiler.common.calc.FloatConvert.L2D; +import static com.oracle.graal.compiler.common.calc.FloatConvert.L2F; -import java.nio.*; -import java.util.*; +import java.nio.ByteBuffer; +import java.util.Formatter; -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.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.SerializableConstant; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.FloatConvertOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; public class ObjectStamp extends AbstractObjectStamp {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/PrimitiveStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/PrimitiveStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.MemoryAccessProvider; /** * Type describing primitive values.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/RawPointerStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/RawPointerStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; /** * Type describing pointers to raw memory. This stamp is used for example for direct pointers to
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/Stamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/Stamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,14 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; /** * A stamp is the basis for a type system.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/StampFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/StampFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,15 @@ */ package com.oracle.graal.compiler.common.type; -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.common.JVMCIError; +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.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; public class StampFactory {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/VoidStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/VoidStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,15 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; /** * Singleton stamp representing the value of type {@code void}.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/ArraySet.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/ArraySet.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.compiler.common.util; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; /** * Mimic a set implementation with an ArrayList. Beneficial for small sets (compared to
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/BitMap2D.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/BitMap2D.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.util; -import java.util.*; +import java.util.BitSet; /** * This class implements a two-dimensional bitmap.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/FrequencyEncoder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/FrequencyEncoder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,11 @@ */ package com.oracle.graal.compiler.common.util; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; /** * Creates an array of T objects order by the occurrence frequency of each object. The most
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/IntList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/IntList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.util; -import java.util.*; +import java.util.Arrays; /** * An expandable and indexable list of {@code int}s.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/Util.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/Util.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.compiler.common.util; -import java.util.*; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.*; +import com.oracle.graal.debug.TTY; /** * The {@code Util} class contains a motley collection of utility methods used throughout the
--- a/graal/com.oracle.graal.compiler.match.processor/src/com/oracle/graal/compiler/match/processor/MatchProcessor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.match.processor/src/com/oracle/graal/compiler/match/processor/MatchProcessor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,60 @@ */ package com.oracle.graal.compiler.match.processor; -import java.io.*; -import java.util.*; -import java.util.regex.*; +import java.io.FileWriter; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -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.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +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.MirroredTypeException; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.AbstractAnnotationValueVisitor7; +import javax.lang.model.util.ElementFilter; +import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import javax.tools.*; +import javax.tools.FileObject; +import javax.tools.JavaFileObject; +import javax.tools.StandardLocation; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.service.ServiceProvider; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.match.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; +import com.oracle.graal.compiler.match.ComplexMatchResult; +import com.oracle.graal.compiler.match.MatchRule; +import com.oracle.graal.compiler.match.MatchRules; +import com.oracle.graal.compiler.match.MatchStatement; +import com.oracle.graal.compiler.match.MatchStatementSet; +import com.oracle.graal.compiler.match.MatchableNode; +import com.oracle.graal.compiler.match.MatchableNodes; +import com.oracle.graal.graph.Position; +import com.oracle.graal.nodes.ValueNode; /** * Processes classes annotated with {@link MatchRule}. A {@link MatchStatementSet} service is
--- a/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.compiler.sparc.test; -import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static org.junit.Assume.*; -import jdk.internal.jvmci.sparc.*; +import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.TraceRA; +import static com.oracle.graal.compiler.common.GraalOptions.RegisterPressure; +import static org.junit.Assume.assumeTrue; +import jdk.internal.jvmci.sparc.SPARC; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.compiler.test.backend.*; +import com.oracle.graal.compiler.test.backend.AllocatorTest; public class SPARCAllocatorTest extends AllocatorTest {
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCAddressLowering.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCAddressLowering.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,13 +23,13 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.memory.address.AddressNode; import com.oracle.graal.phases.common.AddressLoweringPhase.AddressLowering; public class SPARCAddressLowering extends AddressLowering {
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCImmediateAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCImmediateAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,15 +23,17 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.sparc.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.sparc.SPARCImmediateAddressValue; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Represents an address of the form [base + simm13].
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCIndexedAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCIndexedAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,14 +23,16 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.sparc.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.sparc.SPARCIndexedAddressValue; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Represents an address of the form [base + index].
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,39 +23,142 @@ package com.oracle.graal.compiler.sparc; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static com.oracle.graal.lir.sparc.SPARCArithmetic.*; -import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.*; -import static com.oracle.graal.lir.sparc.SPARCCompare.*; -import static com.oracle.graal.lir.sparc.SPARCMathIntrinsicOp.IntrinsicOpcode.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import static com.oracle.graal.lir.LIRValueUtil.asConstantValue; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.B2I; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.B2L; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.D2F; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.D2I; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.D2L; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.DADD; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.DDIV; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.DMUL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.DNEG; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.DSUB; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.F2D; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.F2I; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.F2L; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.FADD; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.FDIV; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.FMUL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.FNEG; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.FSUB; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.I2D; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.I2F; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.I2L; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IADD; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IADDCC; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IAND; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IDIV; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IMUL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IMULCC; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.INEG; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.INOT; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IOR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IREM; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.ISHL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.ISHR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.ISUB; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.ISUBCC; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IUMUL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IUREM; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IUSHR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.IXOR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.L2D; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.L2F; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.L2I; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LADD; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LADDCC; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LAND; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LDIV; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LMUL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LNEG; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LNOT; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LOR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LREM; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LSHL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LSHR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LSUB; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LSUBCC; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LUDIV; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LUMUL; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LUREM; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LUSHR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.LXOR; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.S2I; +import static com.oracle.graal.lir.sparc.SPARCArithmetic.S2L; +import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.BSF; +import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.IBSR; +import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.IPOPCNT; +import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.LBSR; +import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.LPOPCNT; +import static com.oracle.graal.lir.sparc.SPARCCompare.ACMP; +import static com.oracle.graal.lir.sparc.SPARCCompare.DCMP; +import static com.oracle.graal.lir.sparc.SPARCCompare.FCMP; +import static com.oracle.graal.lir.sparc.SPARCCompare.ICMP; +import static com.oracle.graal.lir.sparc.SPARCCompare.LCMP; +import static com.oracle.graal.lir.sparc.SPARCMathIntrinsicOp.IntrinsicOpcode.ABS; +import static com.oracle.graal.lir.sparc.SPARCMathIntrinsicOp.IntrinsicOpcode.SQRT; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.sparc.SPARC; import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCAssembler.CC; import com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.calc.FloatConvert; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.spi.LIRKindTool; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRValueUtil; +import com.oracle.graal.lir.LabelRef; import com.oracle.graal.lir.StandardOp.NoOp; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.lir.SwitchStrategy; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGenerator; +import com.oracle.graal.lir.gen.SpillMoveFactoryBase; +import com.oracle.graal.lir.sparc.SPARCAddressValue; +import com.oracle.graal.lir.sparc.SPARCArithmetic; import com.oracle.graal.lir.sparc.SPARCArithmetic.BinaryRegConst; import com.oracle.graal.lir.sparc.SPARCArithmetic.BinaryRegReg; import com.oracle.graal.lir.sparc.SPARCArithmetic.MulHighOp; import com.oracle.graal.lir.sparc.SPARCArithmetic.RemOp; import com.oracle.graal.lir.sparc.SPARCArithmetic.SPARCLMulccOp; import com.oracle.graal.lir.sparc.SPARCArithmetic.Unary2Op; +import com.oracle.graal.lir.sparc.SPARCArrayEqualsOp; +import com.oracle.graal.lir.sparc.SPARCBitManipulationOp; +import com.oracle.graal.lir.sparc.SPARCByteSwapOp; +import com.oracle.graal.lir.sparc.SPARCCall; +import com.oracle.graal.lir.sparc.SPARCCompare; import com.oracle.graal.lir.sparc.SPARCCompare.CompareOp; +import com.oracle.graal.lir.sparc.SPARCControlFlow; import com.oracle.graal.lir.sparc.SPARCControlFlow.BranchOp; import com.oracle.graal.lir.sparc.SPARCControlFlow.CondMoveOp; import com.oracle.graal.lir.sparc.SPARCControlFlow.ReturnOp; import com.oracle.graal.lir.sparc.SPARCControlFlow.StrategySwitchOp; import com.oracle.graal.lir.sparc.SPARCControlFlow.TableSwitchOp; +import com.oracle.graal.lir.sparc.SPARCImmediateAddressValue; +import com.oracle.graal.lir.sparc.SPARCJumpOp; +import com.oracle.graal.lir.sparc.SPARCLoadConstantTableBaseOp; +import com.oracle.graal.lir.sparc.SPARCMathIntrinsicOp; +import com.oracle.graal.lir.sparc.SPARCMove; import com.oracle.graal.lir.sparc.SPARCMove.LoadAddressOp; import com.oracle.graal.lir.sparc.SPARCMove.LoadDataAddressOp; import com.oracle.graal.lir.sparc.SPARCMove.LoadOp; @@ -64,7 +167,8 @@ import com.oracle.graal.lir.sparc.SPARCMove.MoveFpGp; import com.oracle.graal.lir.sparc.SPARCMove.NullCheckOp; import com.oracle.graal.lir.sparc.SPARCMove.StackLoadAddressOp; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.lir.sparc.SPARCTestOp; +import com.oracle.graal.phases.util.Providers; /** * This class implements the SPARC specific portion of the LIR generator.
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,19 +23,29 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.match.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; +import com.oracle.graal.compiler.match.ComplexMatchResult; +import com.oracle.graal.compiler.match.MatchRule; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LabelRef; import com.oracle.graal.lir.StandardOp.JumpOp; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.sparc.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.sparc.SPARCBreakpointOp; +import com.oracle.graal.lir.sparc.SPARCJumpOp; +import com.oracle.graal.nodes.BreakpointNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.memory.Access; /** * This class implements the SPARC specific portion of the LIR generator.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/AllocSpy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/AllocSpy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.compiler.test; -import static java.lang.Boolean.*; -import static java.lang.Integer.*; -import static java.lang.System.*; +import static java.lang.Boolean.parseBoolean; +import static java.lang.Integer.getInteger; +import static java.lang.System.getProperty; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.io.PrintStream; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.google.monitoring.runtime.instrumentation.*; +import com.google.monitoring.runtime.instrumentation.AllocationRecorder; +import com.google.monitoring.runtime.instrumentation.Sampler; /** * Tool for analyzing allocations within a scope using the <a
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingEliminationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingEliminationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.loop.phases.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.loop.phases.LoopPeelingPhase; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/BoxingTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; public class BoxingTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CommonedConstantsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CommonedConstantsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.compiler.test; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.phases.common.AbstractInliningPhase; /** * Tests any optimization that commons loads of non-inlineable constants.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CompareCanonicalizerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CompareCanonicalizerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.IntegerTestNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class CompareCanonicalizerTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConcreteSubtypeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConcreteSubtypeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions.Assumption; +import jdk.internal.jvmci.meta.Assumptions.ConcreteSubtype; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; /** * Ensure that abstract classes with a single implementor are properly optimized and that loading a
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.compiler.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import java.util.*; +import java.util.Random; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.common.calc.*; +import com.oracle.graal.compiler.common.calc.Condition; public class ConditionTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; +import com.oracle.graal.api.directives.GraalDirectives; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest10.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest10.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.StructuredGraph.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DominatorConditionalEliminationPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * This test checks the combined action of
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DominatorConditionalEliminationPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest3.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest5.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest5.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest6.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest6.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest7.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest7.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest8.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest8.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest9.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest9.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; +import com.oracle.graal.api.directives.GraalDirectives; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTestBase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ConvertDeoptimizeToGuardPhase; +import com.oracle.graal.phases.common.DominatorConditionalEliminationPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Collection of tests for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CopyOfVirtualizationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CopyOfVirtualizationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,12 +23,12 @@ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.Arrays; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.java.NewArrayNode; public class CopyOfVirtualizationTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CountedLoopTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CountedLoopTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,24 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.loop.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.loop.InductionVariable; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; public class CountedLoopTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/DegeneratedLoopsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/DegeneratedLoopsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/EliminateNestedCheckCastsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/EliminateNestedCheckCastsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class EliminateNestedCheckCastsTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,30 @@ */ package com.oracle.graal.compiler.test; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.util.HashMap; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; - -import org.junit.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.Assumption; +import jdk.internal.jvmci.meta.Assumptions.NoFinalizableSubclass; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; +import org.junit.Assert; +import org.junit.Test; + +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.java.RegisterFinalizerNode; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; public class FinalizableSubclassTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FindUniqueConcreteMethodBugTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FindUniqueConcreteMethodBugTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import org.junit.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; public class FindUniqueConcreteMethodBugTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FloatOptimizationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FloatOptimizationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; /** * Check for incorrect elimination of 0.0 and -0.0 from computations. They can affect the sign of
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FloatingReadTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FloatingReadTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,23 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.extended.MonitorExit; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class FloatingReadTest extends GraphScheduleTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerAssumptionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerAssumptionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.Assumptions.Assumption; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public abstract class GraalCompilerAssumptionsTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,54 +22,100 @@ */ package com.oracle.graal.compiler.test; -import static com.oracle.graal.compiler.GraalCompiler.*; -import static com.oracle.graal.nodes.ConstantNode.*; -import static jdk.internal.jvmci.code.CodeUtil.*; -import static jdk.internal.jvmci.compiler.Compiler.*; +import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; +import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; +import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; +import static jdk.internal.jvmci.compiler.Compiler.PrintCompilation; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.atomic.*; -import java.util.function.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.SpeculationLog; +import jdk.internal.jvmci.options.DerivedOptionValue; -import org.junit.*; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import org.junit.internal.AssumptionViolatedException; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.*; -import com.oracle.graal.java.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.StructuredGraph.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.schedule.SchedulePhase.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.runtime.*; -import com.oracle.graal.test.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.GraalCompiler; +import com.oracle.graal.compiler.GraalCompiler.Request; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.debug.DebugEnvironment; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; +import com.oracle.graal.java.ComputeLoopFrequenciesClosure; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.BreakpointNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.InfopointNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ConvertDeoptimizeToGuardPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.phases.tiers.TargetProvider; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.runtime.RuntimeProvider; +import com.oracle.graal.test.GraalTest; /** * Base class for Graal compiler unit tests.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraphEncoderTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraphEncoderTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.compiler.test; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.EncodedGraph; +import com.oracle.graal.nodes.GraphEncoder; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class GraphEncoderTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraphScheduleTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraphScheduleTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.List; -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.phases.schedule.SchedulePhase; public class GraphScheduleTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GuardEliminationCornerCasesTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GuardEliminationCornerCasesTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,27 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ConditionalEliminationPhase; +import com.oracle.graal.phases.common.ConvertDeoptimizeToGuardPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.HighTierContext; public class GuardEliminationCornerCasesTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/IfCanonicalizerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/IfCanonicalizerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,27 @@ */ package com.oracle.graal.compiler.test; -import static com.oracle.graal.graph.iterators.NodePredicates.*; -import com.oracle.graal.debug.*; +import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.ValueAnchorCleanupPhase; +import com.oracle.graal.phases.tiers.MidTierContext; +import com.oracle.graal.phases.tiers.PhaseContext; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/IfReorderTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/IfReorderTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.compiler.test; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; -import org.junit.*; +import org.junit.Test; public class IfReorderTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ImplicitNullCheckTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ImplicitNullCheckTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,26 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.MidTierContext; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Tests that the hub access and the null check are folded.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,29 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.compiler.GraalCompiler.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static jdk.internal.jvmci.code.CodeUtil.*; -import static org.junit.Assert.*; +import static com.oracle.graal.compiler.GraalCompiler.compileGraph; +import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; +import static com.oracle.graal.compiler.common.GraalOptions.OptAssumptions; +import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; +import static org.junit.Assert.assertNotNull; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.CompilationResult.Call; +import jdk.internal.jvmci.code.CompilationResult.Infopoint; +import jdk.internal.jvmci.code.InfopointReason; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.HighTierContext; /** * Test that infopoints in {@link CompilationResult}s have correctly assigned reasons.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/IntegerEqualsCanonicalizerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/IntegerEqualsCanonicalizerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class IntegerEqualsCanonicalizerTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InvokeExceptionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InvokeExceptionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; public class InvokeExceptionTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InvokeHintsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InvokeHintsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; public class InvokeHintsTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LockEliminationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LockEliminationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.java.MonitorExitNode; +import com.oracle.graal.nodes.java.RawMonitorEnterNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.LockEliminationPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.ValueAnchorCleanupPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.PhaseContext; public class LockEliminationTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LongNodeChainTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LongNodeChainTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.debug.OpaqueNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.tiers.HighTierContext; public class LongNodeChainTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,18 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.loop.phases.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.loop.phases.LoopUnswitchingPhase; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class LoopUnswitchTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MarkUnsafeAccessTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MarkUnsafeAccessTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,33 @@ */ package com.oracle.graal.compiler.test; -import static java.nio.file.StandardOpenOption.*; +import static java.nio.file.StandardOpenOption.READ; +import static java.nio.file.StandardOpenOption.WRITE; -import java.io.*; -import java.nio.*; -import java.nio.channels.*; -import java.nio.channels.FileChannel.*; -import java.nio.file.*; - -import org.junit.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.channels.FileChannel.MapMode; +import java.nio.file.Files; +import java.nio.file.Path; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.policy.*; -import com.oracle.graal.phases.tiers.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import sun.misc.*; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + +import sun.misc.Unsafe; + +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.common.inlining.policy.InlineEverythingPolicy; +import com.oracle.graal.phases.tiers.HighTierContext; public class MarkUnsafeAccessTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; - -import com.oracle.graal.nodes.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; + +import org.junit.Test; + +import com.oracle.graal.nodes.StructuredGraph; public class MemoryArithmeticTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,36 +22,48 @@ */ package com.oracle.graal.compiler.test; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.graph.test.matchers.NodeIterableCount.*; -import static org.hamcrest.core.IsInstanceOf.*; -import static org.junit.Assert.*; - -import java.util.*; +import static com.oracle.graal.compiler.common.GraalOptions.OptImplicitNullChecks; +import static com.oracle.graal.compiler.common.GraalOptions.OptScheduleOutOfLoops; +import static com.oracle.graal.graph.test.matchers.NodeIterableCount.hasCount; +import static org.hamcrest.core.IsInstanceOf.instanceOf; +import static org.junit.Assert.assertThat; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.StructuredGraph.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.schedule.SchedulePhase.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.WriteNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.RemoveValueProxyPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.MidTierContext; /** * In these test the FrameStates are explicitly cleared out, so that the scheduling of
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MergeCanonicalizerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MergeCanonicalizerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class MergeCanonicalizerTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MethodHandleEagerResolution.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MethodHandleEagerResolution.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.compiler.test; -import java.lang.invoke.*; -import java.lang.reflect.*; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Field; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.StructuredGraph.*; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public final class MethodHandleEagerResolution extends GraalCompilerTest { private static final MethodHandle FIELD_HANDLE;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MonitorGraphTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.graal.compiler.test; -import static com.oracle.graal.graph.iterators.NodePredicates.*; +import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.java.MonitorExitNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/NestedLoopTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/NestedLoopTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.java.MethodCallTargetNode; public class NestedLoopTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/NodePosIteratorTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/NodePosIteratorTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,20 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeClassIterable; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.NodeSuccessorList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; public class NodePosIteratorTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/OnStackReplacementTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/OnStackReplacementTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; public class OnStackReplacementTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/OptionsVerifierTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/OptionsVerifierTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,37 @@ */ package com.oracle.graal.compiler.test; -import static java.lang.String.*; +import static java.lang.String.format; -import java.io.*; -import java.lang.reflect.*; -import java.nio.file.*; -import java.util.*; -import java.util.zip.*; +import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Executable; +import java.lang.reflect.Method; +import java.nio.file.Files; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.ServiceLoader; +import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipException; +import java.util.zip.ZipFile; -import jdk.internal.jvmci.options.*; -import jdk.internal.org.objectweb.asm.*; +import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.internal.jvmci.options.OptionDescriptors; +import jdk.internal.jvmci.options.OptionValue; +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 org.junit.*; +import org.junit.Test; /** * Verifies a class declaring one or more {@linkplain OptionValue options} has a class initializer
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PhiCreationTests.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PhiCreationTests.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; +import org.junit.Assert; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; +import com.oracle.graal.nodes.ValuePhiNode; /** * In the following tests, the correct removal of redundant phis during graph building is tested.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ProfilingInfoTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ProfilingInfoTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,16 @@ */ package com.oracle.graal.compiler.test; -import java.io.*; +import java.io.Serializable; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; /** * Tests profiling information provided by the runtime.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushNodesThroughPiTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushNodesThroughPiTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,28 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.PushThroughPiPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class PushNodesThroughPiTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushThroughIfTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushThroughIfTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,15 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class PushThroughIfTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReadAfterCheckCastTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReadAfterCheckCastTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.OptimizeGuardAnchorsPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /* consider * B b = (B) a;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReassociateAndCanonicalTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReassociateAndCanonicalTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class ReassociateAndCanonicalTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ScalarTypeSystemTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ScalarTypeSystemTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * In the following tests, the scalar type system of the compiler should be complete enough to see
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SchedulingTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SchedulingTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.List; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; public class SchedulingTest extends GraphScheduleTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SchedulingTest2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SchedulingTest2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,34 @@ */ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.List; -import com.oracle.graal.debug.*; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodes.BeginNode; import com.oracle.graal.nodes.DeoptimizingNode.DeoptDuring; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FrameStateAssignmentPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.tiers.MidTierContext; +import com.oracle.graal.phases.tiers.PhaseContext; public class SchedulingTest2 extends GraphScheduleTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ShortCircuitNodeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ShortCircuitNodeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; import com.oracle.graal.compiler.test.ea.EATestBase.TestClassInt;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SimpleCFGTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/SimpleCFGTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,24 @@ */ package com.oracle.graal.compiler.test; -import java.util.*; +import java.util.Iterator; +import java.util.List; -import com.oracle.graal.debug.*; +import org.junit.Assert; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.cfg.*; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; public class SimpleCFGTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StampCanonicalizerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StampCanonicalizerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * This class tests some specific patterns the stamp system should be able to canonicalize away
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StaticInterfaceFieldTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StaticInterfaceFieldTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,33 @@ */ package com.oracle.graal.compiler.test; -import static com.oracle.graal.debug.DelegatingDebugConfig.Feature.*; +import static com.oracle.graal.debug.DelegatingDebugConfig.Feature.INTERCEPT; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Assume; +import org.junit.Test; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugConfigScope; +import com.oracle.graal.debug.DelegatingDebugConfig; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.runtime.*; -import com.oracle.graal.test.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.VerifyPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.runtime.RuntimeProvider; +import com.oracle.graal.test.GraalTest; /** * Test that interfaces are correctly initialized by a static field resolution during eager graph
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StraighteningTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StraighteningTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.compiler.test; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class StraighteningTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,29 @@ */ package com.oracle.graal.compiler.test; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; -import com.oracle.graal.debug.*; - -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ConditionalEliminationPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * In the following tests, the scalar type system of the compiler should be complete enough to see
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeWriterTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeWriterTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,14 @@ */ package com.oracle.graal.compiler.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.common.util.*; +import com.oracle.graal.compiler.common.util.TypeConversion; +import com.oracle.graal.compiler.common.util.TypeReader; +import com.oracle.graal.compiler.common.util.TypeWriter; +import com.oracle.graal.compiler.common.util.UnsafeArrayTypeReader; +import com.oracle.graal.compiler.common.util.UnsafeArrayTypeWriter; public class TypeWriterTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,22 @@ */ package com.oracle.graal.compiler.test.backend; -import java.util.*; +import java.util.HashSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.meta.Value; -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.nodes.*; +import com.oracle.graal.lir.ValueProcedure; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public class AllocatorTest extends BackendTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,19 @@ */ package com.oracle.graal.compiler.test.backend; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; -import static jdk.internal.jvmci.code.CodeUtil.*; - -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.compiler.GraalCompiler; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.schedule.SchedulePhase; public abstract class BackendTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.compiler.test.deopt; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * In the following tests, the usages of local variable "a" are replaced with the integer constant
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/MonitorDeoptTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/MonitorDeoptTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,13 +24,20 @@ */ package com.oracle.graal.compiler.test.deopt; -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.ResolvedJavaMethod; + +import org.junit.Assert; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public final class MonitorDeoptTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/SynchronizedMethodDeoptimizationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/SynchronizedMethodDeoptimizationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.test.deopt; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; import com.oracle.graal.compiler.test.ea.EATestBase.TestClassObject; /**
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EAMergingTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EAMergingTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.compiler.test.ea; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ValuePhiNode; public class EAMergingTest extends EATestBase {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,27 @@ */ package com.oracle.graal.compiler.test.ea; -import java.util.*; +import java.util.List; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.nodes.java.NewArrayNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; //JaCoCo Exclude
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EarlyReadEliminationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EarlyReadEliminationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,23 @@ */ package com.oracle.graal.compiler.test.ea; -import java.util.*; +import java.util.List; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.virtual.phases.ea.EarlyReadEliminationPhase; public class EarlyReadEliminationTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EscapeAnalysisTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EscapeAnalysisTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,20 @@ */ package com.oracle.graal.compiler.test.ea; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.loop.phases.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.loop.phases.LoopFullUnrollPhase; +import com.oracle.graal.loop.phases.LoopPeelingPhase; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; /** * The PartialEscapeAnalysisPhase is expected to remove all allocations and return the correct
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/NestedBoxingTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/NestedBoxingTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test.ea; -import org.junit.*; +import org.junit.Test; public class NestedBoxingTest extends EATestBase {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAAssertionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAAssertionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.test.ea; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.SourceStackTrace; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; public class PEAAssertionsTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PartialEscapeAnalysisTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PartialEscapeAnalysisTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,28 @@ */ package com.oracle.graal.compiler.test.ea; -import java.lang.ref.*; +import java.lang.ref.SoftReference; -import org.junit.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.TypeSystemTest; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.extended.UnboxNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.java.NewArrayNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; /** * The PartialEscapeAnalysisPhase is expected to remove all allocations and return the correct
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PoorMansEATest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PoorMansEATest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,24 @@ */ package com.oracle.graal.compiler.test.ea; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.java.AbstractNewObjectNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Tests {@link AbstractNewObjectNode#simplify(com.oracle.graal.graph.spi.SimplifierTool)}.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,28 @@ */ package com.oracle.graal.compiler.test.inlining; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.InfopointReason; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; public class InliningTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/GraalTutorial.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/GraalTutorial.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.compiler.test.tutorial; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.java.*; +import com.oracle.graal.java.BytecodeDisassembler; /** * Examples for the Graal tutorial. Run them using the unittest harness of the mx script. To look at
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,35 @@ */ package com.oracle.graal.compiler.test.tutorial; -import java.lang.reflect.*; -import java.util.concurrent.atomic.*; +import java.lang.reflect.Method; +import java.util.concurrent.atomic.AtomicInteger; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CallingConvention; import jdk.internal.jvmci.code.CallingConvention.Type; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.Scope; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.GraalCompiler; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.runtime.RuntimeProvider; /** * Sample code that shows how to invoke Graal from an application.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysis.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysis.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,49 @@ */ package com.oracle.graal.compiler.test.tutorial; -import java.util.*; - -import jdk.internal.jvmci.common.*; +import java.util.ArrayDeque; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +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 com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.java.*; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; +import com.oracle.graal.java.GraphBuilderPhase; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.NewArrayNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.graph.StatelessPostOrderNodeIterator; /** * A simple context-insensitive static analysis based on the Graal API. It is intended for
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysisTests.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysisTests.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,26 @@ */ package com.oracle.graal.compiler.test.tutorial; -import java.lang.reflect.*; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; -import org.junit.*; +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 com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.target.*; +import org.junit.Assert; +import org.junit.Test; + +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.target.Backend; import com.oracle.graal.compiler.test.tutorial.StaticAnalysis.MethodState; import com.oracle.graal.compiler.test.tutorial.StaticAnalysis.TypeFlow; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.runtime.RuntimeProvider; public class StaticAnalysisTests {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThread.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThread.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,7 +23,8 @@ package com.oracle.graal.compiler; import com.oracle.graal.compiler.CompilerThreadFactory.DebugConfigAccess; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.DebugDumpHandler; +import com.oracle.graal.debug.GraalDebugConfig; /** * A compiler thread is a daemon thread that runs at {@link Thread#MAX_PRIORITY} and executes in the
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThreadFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/CompilerThreadFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler; -import java.util.concurrent.*; +import java.util.concurrent.ThreadFactory; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.GraalDebugConfig; /** * Facility for creating {@linkplain CompilerThread compiler threads}.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,44 +22,68 @@ */ package com.oracle.graal.compiler; -import static com.oracle.graal.compiler.GraalCompiler.Options.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig.*; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; +import static com.oracle.graal.compiler.GraalCompiler.Options.EmitLIRRepeatCount; +import static com.oracle.graal.compiler.common.GraalOptions.RegisterPressure; +import static com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig.ALL_REGISTERS; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; -import java.util.*; +import java.util.List; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CompilationResult.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.CompilationResult.ConstantReference; +import jdk.internal.jvmci.code.CompilationResult.DataPatch; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.DefaultProfilingInfo; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.TriState; +import jdk.internal.jvmci.meta.VMConstant; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; import com.oracle.graal.compiler.LIRGenerationPhase.LIRGenerationContext; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.ComputeBlockOrder; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.alloc.lsra.OutOfRegistersException; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.LIRSuites; import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.LowTierContext; +import com.oracle.graal.phases.tiers.MidTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.phases.tiers.TargetProvider; +import com.oracle.graal.phases.util.Providers; /** * Static methods for orchestrating the compilation of a {@linkplain StructuredGraph graph}.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugInitializationPropertyProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugInitializationPropertyProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,11 @@ */ package com.oracle.graal.compiler; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.ServiceProvider; + +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugInitializationPropertyProvider; +import com.oracle.graal.debug.GraalDebugConfig; /** * Sets system properties used in the initialization of {@link Debug} based on the values specified
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/LIRGenerationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/LIRGenerationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,23 @@ */ package com.oracle.graal.compiler; -import static com.oracle.graal.compiler.common.BackendOptions.*; +import static com.oracle.graal.compiler.common.BackendOptions.ConstructionSSAlirDuringLirBuilding; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.ssa.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.graph.Node; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.phases.LIRPhase; +import com.oracle.graal.lir.ssa.SSAUtil; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.phases.schedule.SchedulePhase; public class LIRGenerationPhase extends LIRPhase<LIRGenerationPhase.LIRGenerationContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,17 @@ */ package com.oracle.graal.compiler.gen; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public abstract class BytecodeLIRBuilder { protected final LIRGeneratorTool gen;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.gen; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; /** * visible interface of bytecode parsers.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,34 @@ */ package com.oracle.graal.compiler.gen; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Map; +import java.util.Queue; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.VirtualObject; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.debug.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.virtual.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.EscapeObjectState; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.virtual.nodes.MaterializedObjectState; +import com.oracle.graal.virtual.nodes.VirtualObjectState; /** * Builds {@link LIRFrameState}s from {@link FrameState}s.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/InstructionPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/InstructionPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,16 @@ */ package com.oracle.graal.compiler.gen; -import static com.oracle.graal.compiler.gen.InstructionPrinter.InstructionLineColumn.*; +import static com.oracle.graal.compiler.gen.InstructionPrinter.InstructionLineColumn.BCI; +import static com.oracle.graal.compiler.gen.InstructionPrinter.InstructionLineColumn.END; +import static com.oracle.graal.compiler.gen.InstructionPrinter.InstructionLineColumn.INSTRUCTION; +import static com.oracle.graal.compiler.gen.InstructionPrinter.InstructionLineColumn.USE; +import static com.oracle.graal.compiler.gen.InstructionPrinter.InstructionLineColumn.VALUE; -import com.oracle.graal.debug.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.LogStream; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValueNodeUtil; /** * A utility for {@linkplain #printInstruction(ValueNode) printing} a node as an expression or
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,42 +22,119 @@ */ package com.oracle.graal.compiler.gen; -import static com.oracle.graal.compiler.common.BackendOptions.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIR.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.compiler.common.BackendOptions.ConstructionSSAlirDuringLirBuilding; +import static com.oracle.graal.compiler.common.GraalOptions.MatchExpressions; +import static com.oracle.graal.debug.GraalDebugConfig.LogVerbose; +import static com.oracle.graal.lir.LIR.verifyBlock; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.match.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.match.ComplexMatchValue; +import com.oracle.graal.compiler.match.MatchRuleRegistry; +import com.oracle.graal.compiler.match.MatchStatement; +import com.oracle.graal.compiler.match.MatchableNode; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.GraalGraphJVMCIError; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClassIterable; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.lir.FullInfopointOp; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.SimpleInfopointOp; import com.oracle.graal.lir.StandardOp.JumpOp; import com.oracle.graal.lir.StandardOp.LabelOp; -import com.oracle.graal.lir.debug.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.SwitchStrategy; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.debug.LIRGenerationDebugContext; import com.oracle.graal.lir.gen.LIRGenerator.Options; +import com.oracle.graal.lir.gen.LIRGeneratorTool; import com.oracle.graal.lir.gen.LIRGeneratorTool.BlockScope; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.lir.gen.PhiResolver; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.DirectCallTargetNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.IndirectCallTargetNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoweredCallTargetNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.SimpleInfopointNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.AndNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.calc.FloatEqualsNode; +import com.oracle.graal.nodes.calc.FloatLessThanNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerEqualsNode; +import com.oracle.graal.nodes.calc.IntegerLessThanNode; +import com.oracle.graal.nodes.calc.IntegerTestNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.calc.LeftShiftNode; +import com.oracle.graal.nodes.calc.MulNode; +import com.oracle.graal.nodes.calc.NarrowNode; +import com.oracle.graal.nodes.calc.ObjectEqualsNode; +import com.oracle.graal.nodes.calc.OrNode; +import com.oracle.graal.nodes.calc.ReinterpretNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.SubNode; +import com.oracle.graal.nodes.calc.UnsignedRightShiftNode; +import com.oracle.graal.nodes.calc.XorNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.IntegerSwitchNode; +import com.oracle.graal.nodes.extended.SwitchNode; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.WriteNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.NodeValueMap; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * This class traverses the HIR instructions and generates LIR instructions from them.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchResult.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchResult.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.match; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.gen.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; /** * A closure that can be evaluated to produce the LIR for some complex match. Using a closure allows
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.compiler.match; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.gen.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; /** * A wrapper value for the lazy evaluation of a complex match. There's an intermediate class for the
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.compiler.match; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.debug.GraalDebugConfig.LogVerbose; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.gen.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; import com.oracle.graal.compiler.match.MatchPattern.Result; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * Container for state captured during a match.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchGenerator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchGenerator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.match; -import com.oracle.graal.compiler.gen.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; /** * Code generator for complex match patterns.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.compiler.match; -import com.oracle.graal.debug.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.Position; +import com.oracle.graal.nodeinfo.Verbosity; /** * A simple recursive pattern matcher for a DAG of nodes.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRule.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRule.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,13 @@ */ package com.oracle.graal.compiler.match; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ConstantNode; /** * This annotation declares a textual pattern for matching an HIR tree. The format is a LISP style
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,24 @@ */ package com.oracle.graal.compiler.match; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.debug.GraalDebugConfig.LogVerbose; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.service.Services; -import jdk.internal.jvmci.service.*; - -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Edges; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.Position; public class MatchRuleRegistry {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRules.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRules.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.compiler.match; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * The repeatable representation of {@link MatchRule}. Should never be used directly.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,20 @@ */ package com.oracle.graal.compiler.match; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.debug.GraalDebugConfig.LogVerbose; -import java.util.*; +import java.util.List; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.gen.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; import com.oracle.graal.compiler.match.MatchPattern.MatchResultCode; import com.oracle.graal.compiler.match.MatchPattern.Result; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.GraalGraphJVMCIError; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodeinfo.Verbosity; /** * A named {@link MatchPattern} along with a {@link MatchGenerator} that can be evaluated to replace
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatementSet.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatementSet.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.match; -import java.util.*; +import java.util.List; -import com.oracle.graal.compiler.gen.*; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; public interface MatchStatementSet { /**
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchableNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchableNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,13 @@ */ package com.oracle.graal.compiler.match; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ValueNode; /** * Describes the properties of a node for use when building a {@link MatchPattern}. These
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchableNodes.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchableNodes.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.compiler.match; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * The repeatable representation of {@link MatchableNode}.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.compiler.phases; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.phases.AllocationPhase.*; -import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.*; -import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; +import com.oracle.graal.lir.phases.AllocationStage; +import com.oracle.graal.lir.phases.LIRPhaseSuite; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import com.oracle.graal.lir.phases.PostAllocationOptimizationStage; +import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import com.oracle.graal.lir.phases.PreAllocationOptimizationStage; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.CompilerConfiguration; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.LowTierContext; +import com.oracle.graal.phases.tiers.MidTierContext; public class BasicCompilerConfiguration implements CompilerConfiguration {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyCompilerConfiguration.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyCompilerConfiguration.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.compiler.phases; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.phases.AllocationPhase.*; -import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.*; -import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; +import com.oracle.graal.lir.phases.EconomyAllocationStage; +import com.oracle.graal.lir.phases.EconomyPostAllocationOptimizationStage; +import com.oracle.graal.lir.phases.EconomyPreAllocationOptimizationStage; +import com.oracle.graal.lir.phases.LIRPhaseSuite; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.CompilerConfiguration; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.LowTierContext; +import com.oracle.graal.phases.tiers.MidTierContext; public class EconomyCompilerConfiguration implements CompilerConfiguration {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyHighTier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyHighTier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.compiler.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.HighTierContext; public class EconomyHighTier extends PhaseSuite<HighTierContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyLowTier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyLowTier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.compiler.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ExpandLogicPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.RemoveValueProxyPhase; +import com.oracle.graal.phases.tiers.LowTierContext; public class EconomyLowTier extends PhaseSuite<LowTierContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyMidTier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyMidTier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.compiler.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FrameStateAssignmentPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoopSafepointInsertionPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.MidTierContext; public class EconomyMidTier extends PhaseSuite<MidTierContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/GraphChangeMonitoringPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/GraphChangeMonitoringPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,20 @@ */ package com.oracle.graal.compiler.phases; -import java.util.*; -import java.util.stream.*; +import java.util.Set; +import java.util.stream.Collectors; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.graph.Graph.NodeEvent; import com.oracle.graal.graph.Graph.NodeEventScope; import com.oracle.graal.graph.Node; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.util.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.util.HashSetNodeEventListener; +import com.oracle.graal.phases.tiers.PhaseContext; /** * A utility phase for detecting when a phase would change the graph and reporting extra information
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,35 @@ */ package com.oracle.graal.compiler.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.compiler.phases.HighTier.Options.*; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; -import jdk.internal.jvmci.options.*; +import static com.oracle.graal.compiler.common.GraalOptions.ConditionalElimination; +import static com.oracle.graal.compiler.common.GraalOptions.FullUnroll; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.compiler.common.GraalOptions.LoopPeeling; +import static com.oracle.graal.compiler.common.GraalOptions.LoopUnswitch; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; +import static com.oracle.graal.compiler.common.GraalOptions.OptConvertDeoptsToGuards; +import static com.oracle.graal.compiler.common.GraalOptions.OptLoopTransform; +import static com.oracle.graal.compiler.common.GraalOptions.PartialEscapeAnalysis; +import static com.oracle.graal.compiler.phases.HighTier.Options.Inline; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.loop.phases.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.loop.phases.LoopFullUnrollPhase; +import com.oracle.graal.loop.phases.LoopPeelingPhase; +import com.oracle.graal.loop.phases.LoopUnswitchingPhase; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ConvertDeoptimizeToGuardPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.IterativeConditionalEliminationPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.RemoveValueProxyPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; public class HighTier extends PhaseSuite<HighTierContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,25 @@ */ package com.oracle.graal.compiler.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; -import jdk.internal.jvmci.options.*; +import static com.oracle.graal.compiler.common.GraalOptions.ConditionalElimination; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.ExpandLogicPhase; +import com.oracle.graal.phases.common.IterativeConditionalEliminationPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.ProfileCompiledMethodsPhase; +import com.oracle.graal.phases.common.RemoveValueProxyPhase; +import com.oracle.graal.phases.common.UseTrappingNullChecksPhase; +import com.oracle.graal.phases.tiers.LowTierContext; public class LowTier extends PhaseSuite<LowTierContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,38 @@ */ package com.oracle.graal.compiler.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.ConditionalElimination; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; +import static com.oracle.graal.compiler.common.GraalOptions.OptDeoptimizationGrouping; +import static com.oracle.graal.compiler.common.GraalOptions.OptEliminatePartiallyRedundantGuards; +import static com.oracle.graal.compiler.common.GraalOptions.OptFloatingReads; +import static com.oracle.graal.compiler.common.GraalOptions.OptPushThroughPi; +import static com.oracle.graal.compiler.common.GraalOptions.OptReadElimination; +import static com.oracle.graal.compiler.common.GraalOptions.ReassociateInvariants; +import static com.oracle.graal.compiler.common.GraalOptions.VerifyHeapAtReturn; -import com.oracle.graal.loop.phases.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.loop.phases.LoopSafepointEliminationPhase; +import com.oracle.graal.loop.phases.ReassociateInvariantPhase; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeoptimizationGroupingPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; +import com.oracle.graal.phases.common.FrameStateAssignmentPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.IncrementalCanonicalizerPhase; +import com.oracle.graal.phases.common.IterativeConditionalEliminationPhase; +import com.oracle.graal.phases.common.LockEliminationPhase; +import com.oracle.graal.phases.common.LoopSafepointInsertionPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.OptimizeGuardAnchorsPhase; +import com.oracle.graal.phases.common.PushThroughPiPhase; +import com.oracle.graal.phases.common.RemoveValueProxyPhase; +import com.oracle.graal.phases.common.ValueAnchorCleanupPhase; +import com.oracle.graal.phases.common.VerifyHeapAtReturnPhase; +import com.oracle.graal.phases.tiers.MidTierContext; +import com.oracle.graal.virtual.phases.ea.EarlyReadEliminationPhase; public class MidTier extends PhaseSuite<MidTierContext> {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,35 @@ */ package com.oracle.graal.compiler.target; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.stack.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.code.stack.StackIntrospection; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.compiler.gen.BytecodeLIRBuilder; +import com.oracle.graal.compiler.gen.BytecodeParserTool; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.phases.tiers.SuitesProvider; +import com.oracle.graal.phases.tiers.TargetProvider; +import com.oracle.graal.phases.util.Providers; /** * Represents a compiler backend for Graal.
--- a/graal/com.oracle.graal.debug.test/src/com/oracle/graal/debug/test/DebugHistogramTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug.test/src/com/oracle/graal/debug/test/DebugHistogramTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.debug.test; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.internal.*; +import org.junit.Assert; +import org.junit.Test; -import org.junit.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugHistogram; +import com.oracle.graal.debug.internal.DebugHistogramAsciiPrinter; +import com.oracle.graal.debug.internal.DebugHistogramRPrinter; public class DebugHistogramTest {
--- a/graal/com.oracle.graal.debug.test/src/com/oracle/graal/debug/test/DebugTimerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug.test/src/com/oracle/graal/debug/test/DebugTimerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,22 @@ */ package com.oracle.graal.debug.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -import java.lang.management.*; +import java.lang.management.ThreadMXBean; -import com.oracle.graal.debug.*; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; -import org.junit.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugConfig; +import com.oracle.graal.debug.DebugConfigScope; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.Management; @SuppressWarnings("try") public class DebugTimerTest {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,32 @@ */ package com.oracle.graal.debug; -import static java.util.FormattableFlags.*; -import static com.oracle.graal.debug.Debug.Initialization.*; -import static com.oracle.graal.debug.DelegatingDebugConfig.Feature.*; +import static com.oracle.graal.debug.Debug.Initialization.INITIALIZER_PROPERTY_NAME; +import static com.oracle.graal.debug.DelegatingDebugConfig.Feature.INTERCEPT; +import static com.oracle.graal.debug.DelegatingDebugConfig.Feature.LOG_METHOD; +import static java.util.FormattableFlags.LEFT_JUSTIFY; +import static java.util.FormattableFlags.UPPERCASE; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.ConcurrentModificationException; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; -import com.oracle.graal.debug.DelegatingDebugConfig.*; -import com.oracle.graal.debug.internal.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.Services; + +import com.oracle.graal.debug.DelegatingDebugConfig.Level; +import com.oracle.graal.debug.internal.DebugHistogramImpl; +import com.oracle.graal.debug.internal.DebugScope; +import com.oracle.graal.debug.internal.MemUseTrackerImpl; +import com.oracle.graal.debug.internal.MetricImpl; +import com.oracle.graal.debug.internal.TimerImpl; /** * Scope based debugging facility. This facility is {@link #isEnabled()} if assertions are enabled
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfig.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfig.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.debug; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.Collection; public interface DebugConfig {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfigScope.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugConfigScope.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import com.oracle.graal.debug.internal.*; +import com.oracle.graal.debug.internal.DebugScope; /** * A utility for scoping a change to the current debug
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugDumpHandler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugDumpHandler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import java.io.*; +import java.io.Closeable; public interface DebugDumpHandler extends Closeable {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,19 @@ */ package com.oracle.graal.debug; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.debug.GraalDebugConfig.Dump; +import static com.oracle.graal.debug.GraalDebugConfig.Log; +import static com.oracle.graal.debug.GraalDebugConfig.Meter; +import static com.oracle.graal.debug.GraalDebugConfig.MethodFilter; +import static com.oracle.graal.debug.GraalDebugConfig.Time; +import static com.oracle.graal.debug.GraalDebugConfig.TrackMemUse; +import static com.oracle.graal.debug.GraalDebugConfig.Verify; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.Services; public class DebugEnvironment {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugFilter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugFilter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.debug; -import java.util.*; -import java.util.regex.*; +import java.util.Arrays; +import java.util.regex.Pattern; -import com.oracle.graal.debug.internal.*; +import com.oracle.graal.debug.internal.DebugScope; /** * Implements the filter specified by the {@link GraalDebugConfig#Dump},
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugHistogram.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugHistogram.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import java.util.*; +import java.util.List; /** * Facility for recording value frequencies.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugMemUseTracker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugMemUseTracker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import com.sun.management.*; +import com.sun.management.ThreadMXBean; /** * Tracks memory usage within a scope using {@link ThreadMXBean}. This facility should be employed
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugTimer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugTimer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; /** * A timer for some activity of interest. A timer should be deployed using the try-with-resources
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DelegatingDebugConfig.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DelegatingDebugConfig.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.debug; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.Collection; +import java.util.EnumMap; +import java.util.Map; -import com.oracle.graal.debug.internal.*; +import com.oracle.graal.debug.internal.DebugScope; public class DelegatingDebugConfig implements DebugConfig {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Fingerprint.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Fingerprint.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,11 @@ */ package com.oracle.graal.debug; -import java.util.*; -import java.util.stream.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; /** * Facility for fingerprinting execution.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/GraalDebugConfig.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/GraalDebugConfig.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.debug; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; public class GraalDebugConfig implements DebugConfig { @SuppressWarnings("all")
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/JavaMethodContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/JavaMethodContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaMethod; /** * Interface for objects used in Debug {@linkplain Debug#context() context} that can provide a
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/LogStream.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/LogStream.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.debug; -import java.io.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; /** * A utility for printing compiler debug and informational output to an output stream.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Management.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Management.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.debug; -import static java.lang.Thread.*; +import static java.lang.Thread.currentThread; -import java.lang.management.*; +import java.lang.management.ManagementFactory; +import java.lang.management.ThreadInfo; +import java.lang.management.ThreadMXBean; -import javax.management.*; +import javax.management.ObjectName; public class Management {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/MethodFilter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/MethodFilter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.debug; -import java.util.*; -import java.util.regex.*; +import java.util.Arrays; +import java.util.regex.Pattern; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.Signature; /** * This class implements a method filter that can filter based on class name, method name and
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/TTY.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/TTY.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.debug; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.regex.*; +import java.io.PrintStream; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.Services; /** * A collection of static methods for printing debug and informational output to a global
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/TTYStreamProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/TTYStreamProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import java.io.*; +import java.io.PrintStream; /** * Provides a {@link PrintStream} that writes to the underlying log stream of the VM.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/CloseableCounterImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/CloseableCounterImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug.internal; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.DebugCloseable; /** * A helper class for DebugValues that can nest and need to split out accumulated and flat values
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugHistogramAsciiPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugHistogramAsciiPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.debug.internal; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.Arrays; +import java.util.List; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.DebugHistogram.*; +import com.oracle.graal.debug.DebugHistogram; +import com.oracle.graal.debug.DebugHistogram.CountedValue; +import com.oracle.graal.debug.DebugHistogram.Printer; /** * Renders a textual representation of a histogram to a given print stream.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugHistogramImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugHistogramImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.debug.internal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.DebugHistogram; public class DebugHistogramImpl implements DebugHistogram {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugHistogramRPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugHistogramRPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.debug.internal; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.List; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.DebugHistogram.*; +import com.oracle.graal.debug.DebugHistogram; +import com.oracle.graal.debug.DebugHistogram.CountedValue; +import com.oracle.graal.debug.DebugHistogram.Printer; /** * Renders a histogram as an R script to a given print stream. The R script emitted for a histogram
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,18 @@ */ package com.oracle.graal.debug.internal; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.PrintStream; +import java.util.Iterator; +import java.util.concurrent.Callable; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugConfig; +import com.oracle.graal.debug.DebugDumpHandler; +import com.oracle.graal.debug.DebugVerifyHandler; +import com.oracle.graal.debug.DelegatingDebugConfig; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.debug.TopLevelDebugConfig; public final class DebugScope implements Debug.Scope {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,12 @@ */ package com.oracle.graal.debug.internal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * A node in a tree of {@link DebugValue}s.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/KeyRegistry.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/KeyRegistry.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,11 @@ */ package com.oracle.graal.debug.internal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Registry for allocating a globally unique integer id to each {@link DebugValue}.
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MemUseTrackerImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MemUseTrackerImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,12 @@ */ package com.oracle.graal.debug.internal; -import static com.oracle.graal.debug.DebugCloseable.*; -import com.oracle.graal.debug.*; +import static com.oracle.graal.debug.DebugCloseable.VOID_CLOSEABLE; + +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugMemUseTracker; +import com.oracle.graal.debug.Management; public final class MemUseTrackerImpl extends AccumulatedDebugValue implements DebugMemUseTracker {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MetricImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MetricImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug.internal; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.DebugMetric; public final class MetricImpl extends DebugValue implements DebugMetric {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.debug.internal; -import static com.oracle.graal.debug.DebugCloseable.*; +import static com.oracle.graal.debug.DebugCloseable.VOID_CLOSEABLE; + +import java.lang.management.ThreadMXBean; +import java.util.concurrent.TimeUnit; -import java.lang.management.*; -import java.util.concurrent.*; - -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.Management; public final class TimerImpl extends AccumulatedDebugValue implements DebugTimer {
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeMapTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeMapTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.graph.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodeinfo.NodeInfo; public class NodeMapTest {
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.graph.test; -import static com.oracle.graal.graph.test.matchers.NodeIterableContains.*; -import static com.oracle.graal.graph.test.matchers.NodeIterableIsEmpty.*; -import static org.junit.Assert.*; +import static com.oracle.graal.graph.test.matchers.NodeIterableContains.contains; +import static com.oracle.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; +import static com.oracle.graal.graph.test.matchers.NodeIterableIsEmpty.isNotEmpty; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; public class NodeUsagesTests {
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeValidationChecksTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeValidationChecksTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.graph.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; public class NodeValidationChecksTest {
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/TypedNodeIteratorTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/TypedNodeIteratorTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.graph.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 static org.junit.Assert.fail; -import java.util.*; +import java.util.Iterator; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; public class TypedNodeIteratorTest {
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/TypedNodeIteratorTest2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/TypedNodeIteratorTest2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.graph.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.Assert; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; public class TypedNodeIteratorTest2 {
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/matchers/NodeIterableContains.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/matchers/NodeIterableContains.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.graph.test.matchers; -import org.hamcrest.*; +import org.hamcrest.Description; +import org.hamcrest.TypeSafeDiagnosingMatcher; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.iterators.NodeIterable; public class NodeIterableContains<T extends Node> extends TypeSafeDiagnosingMatcher<NodeIterable<T>> { private T node;
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/matchers/NodeIterableCount.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/matchers/NodeIterableCount.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph.test.matchers; -import org.hamcrest.*; +import org.hamcrest.Description; +import org.hamcrest.TypeSafeDiagnosingMatcher; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; public class NodeIterableCount extends TypeSafeDiagnosingMatcher<NodeIterable<?>> { private int count;
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/matchers/NodeIterableIsEmpty.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/matchers/NodeIterableIsEmpty.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.graph.test.matchers; -import org.hamcrest.*; -import org.hamcrest.core.*; +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeDiagnosingMatcher; +import org.hamcrest.core.IsNot; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; public class NodeIterableIsEmpty extends TypeSafeDiagnosingMatcher<NodeIterable<?>> {
--- a/graal/com.oracle.graal.graph/.checkstyle_checks.xml Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/.checkstyle_checks.xml Wed Sep 16 21:17:42 2015 +0200 @@ -11,6 +11,10 @@ <module name="Checker"> <property name="severity" value="error"/> <module name="TreeWalker"> + <module name="AvoidStarImport"> + <property name="allowClassImports" value="false"/> + <property name="allowStaticMemberImports" value="false"/> + </module> <property name="tabWidth" value="4"/> <module name="FileContentsHolder"/> <module name="JavadocStyle">
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/CachedGraph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/CachedGraph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.graph; -import java.util.*; -import java.util.function.*; +import java.util.Map; +import java.util.function.Consumer; /** * This class is a container of a graph that needs to be readonly and optionally a lazily created
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/DefaultNodeCollectionsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/DefaultNodeCollectionsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Map; +import java.util.Set; -import com.oracle.graal.api.collections.*; +import com.oracle.graal.api.collections.DefaultCollectionsProvider; /** * A default implementation of {@link NodeCollectionsProvider} that creates standard JDK collection
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Edges.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Edges.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Graph.*; -import static com.oracle.graal.graph.Node.*; +import static com.oracle.graal.graph.Graph.MODIFICATION_COUNTS_ENABLED; +import static com.oracle.graal.graph.Node.NOT_ITERABLE; import static com.oracle.graal.graph.UnsafeAccess.UNSAFE; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.function.BiConsumer; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.Fields; +import com.oracle.graal.compiler.common.FieldsScanner; import com.oracle.graal.graph.NodeClass.EdgeInfo; /**
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraalGraphJVMCIError.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraalGraphJVMCIError.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; /** * This error is the graph/node aware extension of JVMCIError.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,28 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Edges.Type.*; +import static com.oracle.graal.graph.Edges.Type.Successors; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.function.Consumer; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.Fingerprint; import com.oracle.graal.graph.Node.ValueNumberable; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; /** * This class is a graph container, it contains the set of nodes that belong to this graph.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraphNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraphNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Iterator; /** * Iterates over the nodes in a given graph.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/InputEdges.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/InputEdges.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Edges.Type.*; +import static com.oracle.graal.graph.Edges.Type.Inputs; -import java.util.*; +import java.util.ArrayList; import com.oracle.graal.graph.NodeClass.InputInfo; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.nodeinfo.InputType; public final class InputEdges extends Edges {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeBitMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeBitMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; public final class NodeBitMap implements NodeIterable<Node> { private static final int SHIFT = 6;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClassIterable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClassIterable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; /** * The iterator returned by this iterable can be used to access {@link Position positions} during
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeCollectionsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeCollectionsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Map; +import java.util.Set; -import com.oracle.graal.api.collections.*; +import com.oracle.graal.api.collections.CollectionsProvider; /** * Extends {@link CollectionsProvider} with support for creating {@link Node} based collections.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeFlood.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeFlood.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Iterator; +import java.util.Queue; public final class NodeFlood implements Iterable<Node> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeInputList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeInputList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Edges.Type.*; +import static com.oracle.graal.graph.Edges.Type.Inputs; -import java.util.*; +import java.util.Collection; +import java.util.List; import com.oracle.graal.graph.Edges.Type;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,14 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.AbstractList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.RandomAccess; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; public abstract class NodeList<T extends Node> extends AbstractList<T> implements NodeIterable<T>, RandomAccess {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,7 +23,8 @@ package com.oracle.graal.graph; import java.util.AbstractMap.SimpleEntry; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; import java.util.Map.Entry; public class NodeMap<T> extends NodeIdAccessor {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeNodeMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeNodeMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,12 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public final class NodeNodeMap extends NodeMap<Node> implements Map<Node, Node> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodePosIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodePosIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Iterator; /** * Describes an edge slot for a {@link NodeClass}.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeSuccessorList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeSuccessorList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Edges.Type.*; +import static com.oracle.graal.graph.Edges.Type.Successors; -import java.util.*; +import java.util.List; import com.oracle.graal.graph.Edges.Type;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Graph.*; +import static com.oracle.graal.graph.Graph.MODIFICATION_COUNTS_ENABLED; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.graph.iterators.NodeIterable; class NodeUsageIterable implements NodeIterable<Node> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Iterator; +import java.util.NoSuchElementException; class NodeUsageIterator implements Iterator<Node> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageWithModCountIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageWithModCountIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.ConcurrentModificationException; class NodeUsageWithModCountIterator extends NodeUsageIterator {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeWorkList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeWorkList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Queue; public abstract class NodeWorkList implements Iterable<Node> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Position.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Position.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.nodeinfo.InputType; /** * Describes an edge slot for a {@link NodeClass}.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/SuccessorEdges.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/SuccessorEdges.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.graph; -import static com.oracle.graal.graph.Edges.Type.*; +import static com.oracle.graal.graph.Edges.Type.Successors; -import java.util.*; +import java.util.ArrayList; import com.oracle.graal.graph.NodeClass.EdgeInfo;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/TypedGraphNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/TypedGraphNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.graph; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; +import java.util.NoSuchElementException; class TypedGraphNodeIterator<T extends IterableNodeType> implements Iterator<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/DistinctFilteredNodeIterable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/DistinctFilteredNodeIterable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.graph.iterators; -import java.util.*; +import java.util.Iterator; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public class DistinctFilteredNodeIterable<T extends Node> extends FilteredNodeIterable<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/DistinctPredicatedProxyNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/DistinctPredicatedProxyNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph.iterators; -import java.util.*; +import java.util.Iterator; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; public class DistinctPredicatedProxyNodeIterator<T extends Node> extends PredicatedProxyNodeIterator<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.graph.iterators; -import java.util.*; +import java.util.Iterator; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public class FilteredNodeIterable<T extends Node> implements NodeIterable<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.graph.iterators; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public interface NodeIterable<T extends Node> extends Iterable<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph.iterators; -import java.util.*; +import java.util.Iterator; +import java.util.NoSuchElementException; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public abstract class NodeIterator<T extends Node> implements Iterator<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph.iterators; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; import com.oracle.graal.graph.iterators.NodePredicates.AndPredicate; import com.oracle.graal.graph.iterators.NodePredicates.NotPredicate; import com.oracle.graal.graph.iterators.NodePredicates.OrPredicate;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicates.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicates.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph.iterators; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public abstract class NodePredicates {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/PredicatedProxyNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/PredicatedProxyNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.graph.iterators; -import java.util.*; +import java.util.Iterator; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public class PredicatedProxyNodeIterator<T extends Node> extends NodeIterator<T> {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/Canonicalizable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/Canonicalizable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; /** * Nodes can implement {@link Canonicalizable} or one of the two sub-interfaces {@link Unary} and
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.graph.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; public interface CanonicalizerTool {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/SimplifierTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/SimplifierTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph.spi; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; /** * @see Simplifiable
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/util/CollectionsAccess.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/util/CollectionsAccess.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.graph.util; -import java.util.*; +import java.util.Map; +import java.util.Set; -import com.oracle.graal.api.collections.*; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.api.collections.CollectionsProvider; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.api.runtime.GraalRuntime; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeCollectionsProvider; /** * Static methods for accessing the methods in the installed {@link GraalRuntime}'s
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/ForeignCallPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/ForeignCallPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.ForeignCallNode; /** * {@link InvocationPlugin} for converting a method call directly to a foreign call.
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderConfiguration.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderConfiguration.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.graphbuilderconf; -import java.util.*; +import java.util.Arrays; + +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.SimpleInfopointNode; public class GraphBuilderConfiguration {
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,30 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.compiler.common.type.StampFactory.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; +import static com.oracle.graal.compiler.common.type.StampFactory.objectNonNull; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.NullCheckException; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.type.StampTool; /** * Used by a {@link GraphBuilderPlugin} to interface with an object that parses the bytecode of a
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InlineInvokePlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InlineInvokePlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ValueNode; /** * Plugin for specifying what is inlined during graph parsing. This plugin is also notified
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/IntrinsicContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/IntrinsicContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,18 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; -import static jdk.internal.jvmci.code.BytecodeFrame.*; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; +import static jdk.internal.jvmci.code.BytecodeFrame.AFTER_BCI; +import static jdk.internal.jvmci.code.BytecodeFrame.BEFORE_BCI; +import static jdk.internal.jvmci.code.BytecodeFrame.INVALID_FRAMESTATE_BCI; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; /** * An intrinsic is a substitute implementation of a Java method (or a bytecode in the case of
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.graphbuilderconf; -import java.lang.invoke.*; -import java.lang.reflect.*; +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Method; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.type.StampTool; /** * Plugin for handling a specific method invocation.
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,25 @@ */ package com.oracle.graal.graphbuilderconf; -import static java.lang.String.*; +import static java.lang.String.format; -import java.lang.reflect.*; -import java.util.*; -import java.util.stream.*; +import java.lang.reflect.Executable; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.ValueNode; /** * Manages a set of {@link InvocationPlugin}s.
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/LoopExplosionPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/LoopExplosionPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; public interface LoopExplosionPlugin extends GraphBuilderPlugin { boolean shouldExplodeLoops(ResolvedJavaMethod method);
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/MethodSubstitutionPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/MethodSubstitutionPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.graphbuilderconf; -import java.lang.reflect.*; -import java.util.*; -import java.util.stream.*; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.stream.Collectors; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import sun.misc.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import sun.misc.Launcher; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ValueNode; /** * An {@link InvocationPlugin} for a method where the implementation of the method is provided by a
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/NodePlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/NodePlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,14 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ValueNode; public interface NodePlugin extends GraphBuilderPlugin { /**
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/ParameterPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/ParameterPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.graphbuilderconf; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.calc.FloatingNode; public interface ParameterPlugin extends GraphBuilderPlugin { FloatingNode interceptParameter(GraphBuilderContext b, int index, Stamp stamp);
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.hotspot.amd64.test; -import static jdk.internal.jvmci.amd64.AMD64.*; +import static jdk.internal.jvmci.amd64.AMD64.rax; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.asm.amd64.AMD64Assembler; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Ensures that frame omission works in cases where it is expected to.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64DeoptimizationStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64DeoptimizationStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,26 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.amd64.*; +import static jdk.internal.jvmci.amd64.AMD64.r10; +import static jdk.internal.jvmci.amd64.AMD64.r11; +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.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 jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.hotspot.amd64.AMD64HotSpotRegisterConfig; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.stubs.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.stubs.DeoptimizationStub; final class AMD64DeoptimizationStub extends DeoptimizationStub {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64DeoptimizeOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64DeoptimizeOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.hotspot.HotSpotHostBackend.*; +import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.BlockEndOp; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.amd64.AMD64BlockEndOp; +import com.oracle.graal.lir.amd64.AMD64Call; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("DEOPT") final class AMD64DeoptimizeOp extends AMD64BlockEndOp implements BlockEndOp {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,21 +23,24 @@ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address.Scale; -import com.oracle.graal.compiler.amd64.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.nodes.*; +import com.oracle.graal.compiler.amd64.AMD64AddressLowering; +import com.oracle.graal.compiler.amd64.AMD64AddressNode; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.nodes.CompressionNode; import com.oracle.graal.hotspot.nodes.CompressionNode.CompressionOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; public class AMD64HotSpotAddressLowering extends AMD64AddressLowering {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,52 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.inittimer.InitTimer.*; +import static jdk.internal.jvmci.inittimer.InitTimer.timer; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import java.util.*; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.compiler.StartupEventListener; +import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; +import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; +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.Value; +import jdk.internal.jvmci.runtime.JVMCIBackend; +import jdk.internal.jvmci.service.ServiceProvider; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.amd64.*; -import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.replacements.amd64.*; - -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 com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.amd64.AMD64SuitesProvider; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.hotspot.DefaultHotSpotGraalCompilerFactory; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotBackendFactory; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; +import com.oracle.graal.hotspot.HotSpotReplacementsImpl; +import com.oracle.graal.hotspot.meta.HotSpotForeignCallsProvider; +import com.oracle.graal.hotspot.meta.HotSpotGraalConstantReflectionProvider; +import com.oracle.graal.hotspot.meta.HotSpotGraphBuilderPlugins; +import com.oracle.graal.hotspot.meta.HotSpotHostForeignCallsProvider; +import com.oracle.graal.hotspot.meta.HotSpotLoweringProvider; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.meta.HotSpotRegisters; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.hotspot.meta.HotSpotSnippetReflectionProvider; +import com.oracle.graal.hotspot.meta.HotSpotStampProvider; +import com.oracle.graal.hotspot.meta.HotSpotSuitesProvider; +import com.oracle.graal.hotspot.word.HotSpotWordTypes; +import com.oracle.graal.phases.tiers.CompilerConfiguration; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.replacements.amd64.AMD64GraphBuilderPlugins; @ServiceProvider(StartupEventListener.class) public class AMD64HotSpotBackendFactory implements HotSpotBackendFactory, StartupEventListener {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBinaryConsumer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBinaryConsumer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.*; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; +import jdk.internal.jvmci.hotspot.HotSpotConstant; +import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.amd64.AMD64AddressValue; +import com.oracle.graal.lir.amd64.AMD64BinaryConsumer; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class AMD64HotSpotBinaryConsumer {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBytecodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBytecodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,23 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.gen.BytecodeLIRBuilder; +import com.oracle.graal.compiler.gen.BytecodeParserTool; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public class AMD64HotSpotBytecodeLIRBuilder extends BytecodeLIRBuilder {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Register; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("CRUNTIME_CALL_EPILOGUE") final class AMD64HotSpotCRuntimeCallEpilogueOp extends AMD64LIRInstruction {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import static jdk.internal.jvmci.amd64.AMD64.*; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import jdk.internal.jvmci.code.Register; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode final class AMD64HotSpotCRuntimeCallPrologueOp extends AMD64LIRInstruction {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCounterOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCounterOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,26 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.common.JVMCIError.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.amd64.AMD64.rax; +import static jdk.internal.jvmci.amd64.AMD64.rbx; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.common.JVMCIError.unimplemented; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.hotspot.HotSpotCounterOp; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("BenchMarkCounter") public class AMD64HotSpotCounterOp extends HotSpotCounterOp {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.hotspot.HotSpotHostBackend.*; +import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; - -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64Call; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Removes the current frame and tail calls the uncommon trap routine.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.amd64.AMD64Call.DirectCallOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; /**
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,26 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.amd64.AMD64.rax; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.amd64.AMD64.rip; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * Emits code that enters a stack frame which is tailored to call the C++ method
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; - -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.amd64.AMD64BlockEndOp; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * @see AMD64HotSpotEpilogueOp
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Superclass for operations that use the value of RBP saved in a method's prologue.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,19 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Sets up the arguments for an exception handler in the callers frame, removes the current frame
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.hotspot.amd64; -import java.util.*; +import java.util.Map; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.StackSlot; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.hotspot.stubs.Stub; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResultBase; public class AMD64HotSpotLIRGenerationResult extends LIRGenerationResultBase {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.amd64.AMD64.rdx; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * Pops the current frame off the stack including the return address and restores the return
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Pops a deoptimized stack frame off the stack including the return address.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * Emits code that leaves a stack frame which is tailored to call the C++ method
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,19 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.amd64.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.graph.Node; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; +import com.oracle.graal.hotspot.meta.DefaultHotSpotLoweringProvider; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.amd64.AMD64ConvertSnippets; public class AMD64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvider {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,30 +22,46 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; +import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.amd64.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.AMD64Move.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.CallTargetNode.*; -import com.oracle.graal.nodes.spi.*; - -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.debug.*; - -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.compiler.amd64.AMD64NodeLIRBuilder; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.gen.DebugInfoBuilder; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.hotspot.HotSpotDebugInfoBuilder; +import com.oracle.graal.hotspot.HotSpotLockStack; +import com.oracle.graal.hotspot.HotSpotNodeLIRBuilder; +import com.oracle.graal.hotspot.nodes.DirectCompareAndSwapNode; +import com.oracle.graal.hotspot.nodes.HotSpotDirectCallTargetNode; +import com.oracle.graal.hotspot.nodes.HotSpotIndirectCallTargetNode; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.amd64.AMD64Move.CompareAndSwapOp; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodes.CallTargetNode.InvokeKind; +import com.oracle.graal.nodes.DirectCallTargetNode; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.IndirectCallTargetNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.SafepointNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * LIR generator specialized for AMD64 HotSpot.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Patch the return address of the current frame.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,19 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Pushes an interpreter frame to the stack.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,43 @@ */ package com.oracle.graal.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.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.code.*; +import java.util.BitSet; -import com.oracle.graal.compiler.common.alloc.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; + +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; class AMD64HotSpotRegisterAllocationConfig extends RegisterAllocationConfig { /**
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Returns from a function.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,28 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.asm.NumUtil.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static jdk.internal.jvmci.amd64.AMD64.*; +import static com.oracle.graal.asm.NumUtil.isInt; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static jdk.internal.jvmci.amd64.AMD64.rax; +import static jdk.internal.jvmci.amd64.AMD64.rip; +import jdk.internal.jvmci.code.InfopointReason; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Emits a safepoint poll.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,23 @@ */ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.amd64.AMD64.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.amd64.AMD64.rsp; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64Call; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Removes the current frame and jumps to the {@link UnwindExceptionToCallerStub}.
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.amd64.AMD64Call.DirectCallOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; /**
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64IndirectCallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64IndirectCallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64Call; import com.oracle.graal.lir.amd64.AMD64Call.IndirectCallOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * A register indirect call that complies with the extra conventions for such calls in HotSpot. In
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64PrefetchOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64PrefetchOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,13 +23,14 @@ package com.oracle.graal.hotspot.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import jdk.internal.jvmci.common.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.amd64.AMD64AddressValue; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public final class AMD64PrefetchOp extends AMD64LIRInstruction { public static final LIRInstructionClass<AMD64PrefetchOp> TYPE = LIRInstructionClass.create(AMD64PrefetchOp.class);
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.amd64.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.amd64.AMD64NodeLIRBuilder; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class AMD64RawNativeCallNode extends FixedWithNextNode implements LIRLowerable {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64TailcallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64TailcallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.amd64.AMD64LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Performs a hard-coded tail call to the specified target, which normally should be an
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64UncommonTrapStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64UncommonTrapStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,26 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.amd64.*; +import static jdk.internal.jvmci.amd64.AMD64.r10; +import static jdk.internal.jvmci.amd64.AMD64.r11; +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.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 jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.hotspot.amd64.AMD64HotSpotRegisterConfig; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.stubs.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.stubs.UncommonTrapStub; final class AMD64UncommonTrapStub extends UncommonTrapStub {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizationStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizationStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,23 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.sparc.*; +import static jdk.internal.jvmci.sparc.SPARC.g1; +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.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 jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.sparc.SPARCHotSpotRegisterConfig; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.stubs.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.stubs.DeoptimizationStub; final class SPARCDeoptimizationStub extends DeoptimizationStub {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizeOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizeOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.hotspot.sparc; -import static com.oracle.graal.hotspot.HotSpotHostBackend.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.sparc.SPARC; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCBlockEndOp; +import com.oracle.graal.lir.sparc.SPARCCall; @Opcode("DEOPT") final class SPARCDeoptimizeOp extends SPARCBlockEndOp {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,49 @@ */ package com.oracle.graal.hotspot.sparc; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.compiler.StartupEventListener; +import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; +import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.runtime.JVMCIBackend; +import jdk.internal.jvmci.service.ServiceProvider; +import jdk.internal.jvmci.sparc.SPARC; -import com.oracle.graal.compiler.sparc.*; -import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.replacements.sparc.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.compiler.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.runtime.*; -import jdk.internal.jvmci.service.*; -import jdk.internal.jvmci.sparc.*; +import com.oracle.graal.compiler.sparc.SPARCAddressLowering; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.hotspot.DefaultHotSpotGraalCompilerFactory; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotBackendFactory; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; +import com.oracle.graal.hotspot.HotSpotReplacementsImpl; +import com.oracle.graal.hotspot.meta.HotSpotForeignCallsProvider; +import com.oracle.graal.hotspot.meta.HotSpotGraalConstantReflectionProvider; +import com.oracle.graal.hotspot.meta.HotSpotGraphBuilderPlugins; +import com.oracle.graal.hotspot.meta.HotSpotLoweringProvider; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.meta.HotSpotRegisters; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.hotspot.meta.HotSpotSnippetReflectionProvider; +import com.oracle.graal.hotspot.meta.HotSpotStampProvider; +import com.oracle.graal.hotspot.meta.HotSpotSuitesProvider; +import com.oracle.graal.hotspot.word.HotSpotWordTypes; +import com.oracle.graal.java.DefaultSuitesProvider; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.phases.tiers.CompilerConfiguration; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.replacements.sparc.SPARCGraphBuilderPlugins; @ServiceProvider(StartupEventListener.class) public class SPARCHotSpotBackendFactory implements HotSpotBackendFactory, StartupEventListener {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,22 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCDelayedControlTransfer; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; +import com.oracle.graal.lir.sparc.SPARCMove; @Opcode("CRUNTIME_CALL_EPILOGUE") final class SPARCHotSpotCRuntimeCallEpilogueOp extends SPARCLIRInstruction {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,24 @@ */ package com.oracle.graal.hotspot.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; +import com.oracle.graal.lir.sparc.SPARCMove; +import com.oracle.graal.lir.sparc.SPARCTailDelayedLIRInstruction; @Opcode("CRUNTIME_CALL_PROLOGUE") final class SPARCHotSpotCRuntimeCallPrologueOp extends SPARCLIRInstruction implements SPARCTailDelayedLIRInstruction {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCounterOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCounterOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,26 @@ */ package com.oracle.graal.hotspot.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.hotspot.HotSpotCounterOp; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("BenchMarkCounter") public class SPARCHotSpotCounterOp extends HotSpotCounterOp {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import static com.oracle.graal.hotspot.HotSpotHostBackend.*; +import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; +import jdk.internal.jvmci.code.Register; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.asm.sparc.SPARCMacroAssembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCCall; /** * Removes the current frame and tail calls the uncommon trap routine.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotEnterUnpackFramesStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotEnterUnpackFramesStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,36 @@ */ package com.oracle.graal.hotspot.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.meta.LIRKind.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.meta.LIRKind.value; +import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS; +import static jdk.internal.jvmci.sparc.SPARC.g0; +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.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.Register; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.PlatformKind; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Emits code that enters a stack frame which is tailored to call the C++ method
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotEpilogueOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotEpilogueOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.sparc; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCBlockEndOp; /** * Superclass for operations that leave a method's frame.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,25 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.g0; +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.l7; +import static jdk.internal.jvmci.sparc.SPARC.sp; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.asm.sparc.SPARCAssembler.*; -import com.oracle.graal.asm.sparc.SPARCMacroAssembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCAssembler.CC; +import com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Sets up the arguments for an exception handler in the callers frame, removes the current frame
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Jumps to the exception handler specified by {@link #address} and leaves the current window. It
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.sparc; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.StackSlot; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.hotspot.stubs.Stub; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResultBase; public class SPARCHotSpotLIRGenerationResult extends LIRGenerationResultBase {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,22 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.*; +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.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 com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Pops the current frame off the stack.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,22 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.*; +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.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 com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Pops the current frame off the stack including the return address.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveUnpackFramesStackFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveUnpackFramesStackFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import static jdk.internal.jvmci.sparc.SPARC.i0; +import static jdk.internal.jvmci.sparc.SPARC.l7; +import jdk.internal.jvmci.code.Register; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; +import com.oracle.graal.lir.sparc.SPARCSaveRegistersOp; /** * Emits code that leaves a stack frame which is tailored to call the C++ method
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.graph.Node; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; +import com.oracle.graal.hotspot.meta.DefaultHotSpotLoweringProvider; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.spi.LoweringTool; public class SPARCHotSpotLoweringProvider extends DefaultHotSpotLoweringProvider {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.i7; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Patch the return address of the current frame.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,29 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +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.i7; +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.sp; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Pushes an interpreter frame to the stack.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.hotspot.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; import com.oracle.graal.lir.sparc.SPARCControlFlow.ReturnOp; /**
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,23 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import jdk.internal.jvmci.code.InfopointReason; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; /** * Emits a safepoint poll.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotUnwindOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotUnwindOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,25 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.g5; +import static jdk.internal.jvmci.sparc.SPARC.i0; +import static jdk.internal.jvmci.sparc.SPARC.o0; +import static jdk.internal.jvmci.sparc.SPARC.o7; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCCall; /** * Removes the current frame and jumps to the {@link UnwindExceptionToCallerStub}.
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; import com.oracle.graal.lir.sparc.SPARCCall.DirectCallOp; import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static jdk.internal.jvmci.sparc.SPARC.g5; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.asm.sparc.SPARCMacroAssembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; import com.oracle.graal.lir.sparc.SPARCCall.DirectCallOp; import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCIndirectCallOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCIndirectCallOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,20 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.g5; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCCall; import com.oracle.graal.lir.sparc.SPARCCall.IndirectCallOp; /**
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCPrefetchOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCPrefetchOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,12 +23,14 @@ package com.oracle.graal.hotspot.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.sparc.SPARCAddressValue; +import com.oracle.graal.lir.sparc.SPARCLIRInstruction; public final class SPARCPrefetchOp extends SPARCLIRInstruction { public static final LIRInstructionClass<SPARCPrefetchOp> TYPE = LIRInstructionClass.create(SPARCPrefetchOp.class);
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCUncommonTrapStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCUncommonTrapStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,23 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.sparc.*; +import static jdk.internal.jvmci.sparc.SPARC.g1; +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.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 jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.sparc.SPARCHotSpotRegisterConfig; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.stubs.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.stubs.UncommonTrapStub; final class SPARCUncommonTrapStub extends UncommonTrapStub {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,32 +22,42 @@ */ package com.oracle.graal.hotspot.test; -import static com.oracle.graal.compiler.GraalCompiler.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.nodes.ConstantNode.*; -import static jdk.internal.jvmci.code.CodeUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; - -import org.junit.*; +import static com.oracle.graal.compiler.GraalCompiler.compileGraph; +import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; +import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstantImpl; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.nodes.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.phases.tiers.SuitesProvider; +import com.oracle.graal.runtime.RuntimeProvider; /** * use
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ArrayCopyIntrinsificationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ArrayCopyIntrinsificationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,24 @@ */ package com.oracle.graal.hotspot.test; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.HashMap; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.replacements.arraycopy.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.Node; +import com.oracle.graal.hotspot.replacements.arraycopy.ArrayCopySnippets; +import com.oracle.graal.nodes.DirectCallTargetNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoweredCallTargetNode; +import com.oracle.graal.nodes.StructuredGraph; /** * Tests intrinsification of {@link System#arraycopy(Object, int, Object, int, int)}.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CRC32SubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CRC32SubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.hotspot.test; -import java.io.*; -import java.nio.*; -import java.util.zip.*; +import java.io.DataInputStream; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.util.zip.CRC32; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests compiled call to {@link CRC32#update(int, int)}.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ClassSubstitutionsTests.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ClassSubstitutionsTests.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,14 +23,15 @@ package com.oracle.graal.hotspot.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public class ClassSubstitutionsTests extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.graal.hotspot.test; -import static jdk.internal.jvmci.compiler.Compiler.*; - -import org.junit.*; +import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnException; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.CompileTheWorld.*; +import org.junit.Test; -import jdk.internal.jvmci.hotspot.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.hotspot.CompileTheWorld; +import com.oracle.graal.hotspot.CompileTheWorld.Config; +import com.oracle.graal.hotspot.HotSpotGraalCompiler; /** * Tests {@link CompileTheWorld} functionality.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompressedOopTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompressedOopTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,15 +23,21 @@ package com.oracle.graal.hotspot.test; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * The following tests perform object/array equality and assignments in various ways. The selected
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ConstantPoolSubstitutionsTests.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ConstantPoolSubstitutionsTests.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,17 +23,18 @@ package com.oracle.graal.hotspot.test; -import org.junit.*; +import org.junit.Test; + +import sun.misc.SharedSecrets; +import sun.reflect.ConstantPool; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.StructuredGraph.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import sun.misc.*; -import sun.reflect.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public class ConstantPoolSubstitutionsTests extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/DataPatchTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/DataPatchTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,19 +24,23 @@ package com.oracle.graal.hotspot.test; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.hotspot.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import org.junit.*; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.nodes.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.nodes.CompressionNode; import com.oracle.graal.hotspot.nodes.CompressionNode.CompressionOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; public class DataPatchTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ExplicitExceptionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ExplicitExceptionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.extended.ForeignCallNode; public class ExplicitExceptionTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ForeignCallDeoptimizeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ForeignCallDeoptimizeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,19 @@ */ package com.oracle.graal.hotspot.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.test.GraalCompilerTest; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.runtime.RuntimeProvider; /** * Tests that deoptimization upon exception handling works.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,41 @@ */ package com.oracle.graal.hotspot.test; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import java.io.*; -import java.lang.reflect.*; -import java.security.*; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.security.AlgorithmParameters; +import java.security.SecureRandom; -import javax.crypto.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; -import org.junit.*; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.hotspot.HotSpotCompiledNmethod; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.HotSpotNmethod; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graphbuilderconf.*; +import org.junit.Assert; +import org.junit.Test; + +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; +import com.oracle.graal.phases.OptimisticOptimizations; /** * Tests the intrinsification of certain crypto methods.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotGraalCompilerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotGraalCompilerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.hotspot.test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; /** * A Graal compiler test that needs access to the {@link HotSpotGraalRuntimeProvider}.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.hotspot.test; -import java.lang.invoke.*; - -import org.junit.*; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.replacements.test.*; +import org.junit.Test; + +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.replacements.test.MethodSubstitutionTest; /** * Tests HotSpot specific {@link MethodSubstitution}s.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMonitorValueTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMonitorValueTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,26 @@ */ package com.oracle.graal.hotspot.test; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; -import java.util.*; +import java.util.Arrays; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.CompilationResult.Call; +import jdk.internal.jvmci.code.CompilationResult.Infopoint; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.StackLockValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; public class HotSpotMonitorValueTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotNmethodTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotNmethodTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.hotspot.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.hotspot.HotSpotNmethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public class HotSpotNmethodTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.hotspot.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.replacements.test.*; +import com.oracle.graal.replacements.test.MethodSubstitutionTest; /** * Tests HotSpot specific substitutions for {@link Node}.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.hotspot.test; -import java.lang.reflect.*; +import java.lang.reflect.Field; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ModifiersProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; /** * Tests {@link HotSpotResolvedJavaField} functionality.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,12 +23,18 @@ package com.oracle.graal.hotspot.test; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.StampFactory; /** * Tests {@link HotSpotResolvedJavaMethod} functionality.
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.hotspot.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static java.lang.reflect.Modifier.*; +import static java.lang.reflect.Modifier.isStatic; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstantImpl; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; public class InstalledCodeExecuteHelperTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,19 @@ */ package com.oracle.graal.hotspot.test; -import java.util.*; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.tiers.Suites; public class LoadJavaMirrorWithKlassTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.hotspot.test; -import static com.oracle.graal.debug.internal.MemUseTrackerImpl.*; -import jdk.internal.jvmci.hotspot.*; +import static com.oracle.graal.debug.internal.MemUseTrackerImpl.getCurrentThreadAllocatedBytes; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.internal.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.test.AllocSpy; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugEnvironment; +import com.oracle.graal.debug.internal.DebugScope; +import com.oracle.graal.hotspot.CompilationTask; +import com.oracle.graal.hotspot.CompileTheWorld; +import com.oracle.graal.hotspot.HotSpotGraalCompiler; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; /**
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationStatistics.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationStatistics.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,29 @@ */ package com.oracle.graal.hotspot; -import static java.lang.Thread.*; +import static java.lang.Thread.currentThread; -import java.io.*; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Date; +import java.util.Deque; +import java.util.Locale; +import java.util.concurrent.ConcurrentLinkedDeque; -import jdk.internal.jvmci.hotspot.*; +import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import com.oracle.graal.debug.*; -import com.sun.management.*; +import com.oracle.graal.debug.Management; +import com.sun.management.ThreadMXBean; @SuppressWarnings("unused") public final class CompilationStatistics {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,45 @@ */ package com.oracle.graal.hotspot; -import static jdk.internal.jvmci.compiler.Compiler.*; +import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnBailout; +import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnException; +import static jdk.internal.jvmci.compiler.Compiler.PrintAfterCompilation; +import static jdk.internal.jvmci.compiler.Compiler.PrintBailout; +import static jdk.internal.jvmci.compiler.Compiler.PrintCompilation; +import static jdk.internal.jvmci.compiler.Compiler.PrintFilter; +import static jdk.internal.jvmci.compiler.Compiler.PrintStackTraceOnException; import java.lang.reflect.Field; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.compiler.Compiler; +import jdk.internal.jvmci.hotspot.CompilerToVM; +import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; +import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotNmethod; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.hotspot.events.EmptyEventProvider; +import jdk.internal.jvmci.hotspot.events.EventProvider; +import jdk.internal.jvmci.hotspot.events.EventProvider.CompilationEvent; +import jdk.internal.jvmci.hotspot.events.EventProvider.CompilerFailureEvent; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.service.Services; import sun.misc.Unsafe; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.events.*; -import jdk.internal.jvmci.hotspot.events.EventProvider.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.service.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.Management; +import com.oracle.graal.debug.TTY; //JaCoCo Exclude
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,32 +22,68 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.hotspot.CompileTheWorld.Options.*; -import static jdk.internal.jvmci.compiler.Compiler.*; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldClasspath; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldConfig; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldExcludeMethodFilter; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldMethodFilter; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldStartAt; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldStopAt; +import static com.oracle.graal.hotspot.CompileTheWorld.Options.CompileTheWorldVerbose; +import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnException; +import static jdk.internal.jvmci.compiler.Compiler.PrintBailout; +import static jdk.internal.jvmci.compiler.Compiler.PrintStackTraceOnException; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import java.io.*; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.jar.*; -import java.util.stream.*; +import java.io.File; +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.stream.Collectors; import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.hotspot.HotSpotConstantPool; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ConstantPool; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.internal.jvmci.options.OptionsParser; import jdk.internal.jvmci.options.OptionsParser.OptionConsumer; -import jdk.internal.jvmci.runtime.*; +import jdk.internal.jvmci.runtime.JVMCI; -import com.oracle.graal.compiler.*; +import com.oracle.graal.compiler.CompilerThreadFactory; import com.oracle.graal.compiler.CompilerThreadFactory.DebugConfigAccess; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.internal.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugEnvironment; +import com.oracle.graal.debug.GraalDebugConfig; +import com.oracle.graal.debug.MethodFilter; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.debug.internal.DebugScope; +import com.oracle.graal.debug.internal.MemUseTrackerImpl; /** * This class implements compile-the-world functionality with JVMCI. @@ -113,7 +149,7 @@ * </pre> */ @SuppressWarnings("serial") - public static class Config extends HashMap<OptionValue<?>, Object> implements OptionConsumer { + public static class Config extends HashMap<OptionValue<?>, Object>implements OptionConsumer { /** * Creates a {@link Config} object by parsing a set of space separated override options. *
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DebugValuesPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DebugValuesPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.debug.GraalDebugConfig.DebugValueSummary; +import static com.oracle.graal.debug.GraalDebugConfig.DebugValueThreadFilter; +import static com.oracle.graal.debug.GraalDebugConfig.SuppressZeroDebugValues; -import java.io.*; -import java.util.*; -import java.util.regex.*; -import java.util.stream.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.internal.*; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.debug.internal.DebugValue; +import com.oracle.graal.debug.internal.DebugValueMap; +import com.oracle.graal.debug.internal.KeyRegistry; /** * Facility for printing the {@linkplain KeyRegistry#getDebugValues() values} collected across all
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot; -import java.util.*; +import java.util.IdentityHashMap; -import com.oracle.graal.compiler.phases.*; -import com.oracle.graal.phases.tiers.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.compiler.CompilerFactory; +import jdk.internal.jvmci.service.ServiceProvider; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.compiler.*; -import jdk.internal.jvmci.service.*; +import com.oracle.graal.compiler.phases.BasicCompilerConfiguration; +import com.oracle.graal.phases.tiers.CompilerConfiguration; @ServiceProvider(CompilerFactory.class) public class DefaultHotSpotGraalCompilerFactory extends HotSpotGraalCompilerFactory {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot; -import com.oracle.graal.compiler.phases.*; -import com.oracle.graal.phases.tiers.*; +import jdk.internal.jvmci.compiler.CompilerFactory; +import jdk.internal.jvmci.service.ServiceProvider; -import jdk.internal.jvmci.compiler.*; -import jdk.internal.jvmci.service.*; +import com.oracle.graal.compiler.phases.EconomyCompilerConfiguration; +import com.oracle.graal.phases.tiers.CompilerConfiguration; @ServiceProvider(CompilerFactory.class) public class EconomyHotSpotGraalCompilerFactory extends DefaultHotSpotGraalCompilerFactory {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,33 +22,55 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; +import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; -import java.util.*; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.stack.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.DebugInfo; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.code.stack.StackIntrospection; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.replacements.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.DeoptimizationFetchUnrollInfoCallNode; +import com.oracle.graal.hotspot.nodes.UncommonTrapCallNode; +import com.oracle.graal.hotspot.nodes.VMErrorNode; +import com.oracle.graal.hotspot.replacements.AESCryptSubstitutions; +import com.oracle.graal.hotspot.replacements.CipherBlockChainingSubstitutions; +import com.oracle.graal.hotspot.stubs.DeoptimizationStub; +import com.oracle.graal.hotspot.stubs.ExceptionHandlerStub; +import com.oracle.graal.hotspot.stubs.Stub; +import com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.LabelOp; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.word.*; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.ReferenceMapBuilder; +import com.oracle.graal.nodes.UnwindNode; +import com.oracle.graal.phases.tiers.SuitesProvider; +import com.oracle.graal.word.Pointer; +import com.oracle.graal.word.Word; /** * HotSpot specific backend.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompiledRuntimeStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompiledRuntimeStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.hotspot.HotSpotHostBackend.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.hotspot.*; +import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; +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.Infopoint; +import jdk.internal.jvmci.hotspot.HotSpotCompiledCode; +import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; /** * {@link HotSpotCompiledCode} destined for installation as a RuntimeStub.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCounterOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCounterOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.hotspot.debug.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.hotspot.debug.BenchmarkCounters; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRInstructionClass; public abstract class HotSpotCounterOp extends LIRInstruction { public static final LIRInstructionClass<HotSpotCounterOp> TYPE = LIRInstructionClass.create(HotSpotCounterOp.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.hotspot; -import static jdk.internal.jvmci.code.BytecodeFrame.*; +import static jdk.internal.jvmci.code.BytecodeFrame.isPlaceholderBci; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.StackLockValue; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.VirtualObject; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaValue; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.compiler.gen.DebugInfoBuilder; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * Extends {@link DebugInfoBuilder} to allocate the extra debug information required for locks.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.InvokeTarget; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.hotspot.stubs.*; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.hotspot.stubs.Stub; /** * The details required to link a HotSpot runtime or stub call.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,25 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static jdk.internal.jvmci.inittimer.InitTimer.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.inittimer.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.service.*; +import static com.oracle.graal.compiler.common.GraalOptions.BootstrapReplacements; +import static com.oracle.graal.compiler.common.GraalOptions.Intrinsify; +import static jdk.internal.jvmci.inittimer.InitTimer.timer; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.inittimer.InitTimer; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.service.Services; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.hotspot.meta.HotSpotHostForeignCallsProvider; +import com.oracle.graal.hotspot.meta.HotSpotLoweringProvider; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.stubs.DeoptimizationStub; +import com.oracle.graal.hotspot.stubs.UncommonTrapStub; +import com.oracle.graal.nodes.spi.ReplacementsProvider; /** * Common functionality of HotSpot host backends.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotInstructionProfiling.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotInstructionProfiling.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.graal.hotspot; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.Assembler.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.Assembler.InstructionCounter; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRInstructionClass; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; public class HotSpotInstructionProfiling extends PostAllocationOptimizationPhase { public static final String COUNTER_GROUP = "INSTRUCTION_COUNTER";
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLockStack.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLockStack.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMapBuilder; /** * Manages allocation and re-use of lock slots in a scoped manner. The slots are used in HotSpot's
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotNodeLIRBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotNodeLIRBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.hotspot; -import com.oracle.graal.compiler.match.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.match.MatchableNode; +import com.oracle.graal.hotspot.nodes.CompressionNode; +import com.oracle.graal.hotspot.nodes.DirectCompareAndSwapNode; +import com.oracle.graal.lir.gen.LIRGenerator; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * This interface defines the contract a HotSpot backend LIR generator needs to fulfill in addition
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReferenceMapBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReferenceMapBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,26 @@ */ package com.oracle.graal.hotspot; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.ArrayList; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Location; +import jdk.internal.jvmci.code.ReferenceMap; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotReferenceMap; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.framemap.ReferenceMapBuilder; public final class HotSpotReferenceMapBuilder extends ReferenceMapBuilder {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.hotspot; -import java.lang.reflect.*; +import java.lang.reflect.Executable; +import java.lang.reflect.Method; + +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.hotspot.word.HotSpotOperation; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.replacements.IntegerSubstitutions; +import com.oracle.graal.replacements.LongSubstitutions; +import com.oracle.graal.replacements.ReplacementsImpl; /** * Filters certain method substitutions based on whether there is underlying hardware support for
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,16 @@ */ package com.oracle.graal.hotspot; -import java.io.*; -import java.lang.management.*; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.lang.management.ManagementFactory; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.hotspot.CompilerToVM; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; +import jdk.internal.jvmci.options.OptionValue; /** * An option that encapsulates and configures a print stream.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,30 @@ */ package com.oracle.graal.hotspot.debug; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.inittimer.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.CompilerToVM; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.inittimer.SuppressFBWarnings; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.debug.*; -import com.oracle.graal.hotspot.replacements.*; -import com.oracle.graal.nodes.debug.*; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.hotspot.replacements.NewObjectSnippets; +import com.oracle.graal.nodes.debug.DynamicCounterNode; //JaCoCo Exclude
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; /** * HotSpot extension of {@link ForeignCallsProvider}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,36 +22,67 @@ */ package com.oracle.graal.hotspot.meta; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.*; -import static com.oracle.graal.java.BytecodeParser.Options.*; -import static sun.misc.Version.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION; +import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.JAVA_TIME_MILLIS; +import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.JAVA_TIME_NANOS; +import static com.oracle.graal.java.BytecodeParser.Options.InlineDuringParsing; +import static sun.misc.Version.jdkMajorVersion; +import static sun.misc.Version.jdkMinorVersion; -import java.lang.invoke.*; -import java.util.zip.*; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MutableCallSite; +import java.lang.invoke.VolatileCallSite; +import java.util.zip.CRC32; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import sun.reflect.*; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstantImpl; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.options.StableOptionValue; +import sun.reflect.Reflection; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.graphbuilderconf.ForeignCallPlugin; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugin.Receiver; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.replacements.*; -import com.oracle.graal.hotspot.replacements.arraycopy.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.MethodSubstitutionPlugin; +import com.oracle.graal.hotspot.nodes.ClassCastNode; +import com.oracle.graal.hotspot.nodes.CurrentJavaThreadNode; +import com.oracle.graal.hotspot.replacements.AESCryptSubstitutions; +import com.oracle.graal.hotspot.replacements.CRC32Substitutions; +import com.oracle.graal.hotspot.replacements.CallSiteTargetNode; +import com.oracle.graal.hotspot.replacements.CipherBlockChainingSubstitutions; +import com.oracle.graal.hotspot.replacements.HotSpotClassSubstitutions; +import com.oracle.graal.hotspot.replacements.IdentityHashCodeNode; +import com.oracle.graal.hotspot.replacements.ObjectCloneNode; +import com.oracle.graal.hotspot.replacements.ObjectSubstitutions; +import com.oracle.graal.hotspot.replacements.ReflectionGetCallerClassNode; +import com.oracle.graal.hotspot.replacements.arraycopy.ArrayCopyNode; +import com.oracle.graal.hotspot.word.HotSpotWordTypes; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.replacements.InlineDuringParsingPlugin; +import com.oracle.graal.replacements.MethodHandlePlugin; +import com.oracle.graal.replacements.NodeIntrinsificationPhase; +import com.oracle.graal.replacements.NodeIntrinsificationPlugin; +import com.oracle.graal.replacements.ReplacementsImpl; +import com.oracle.graal.replacements.StandardGraphBuilderPlugins; +import com.oracle.graal.replacements.WordOperationPlugin; +import com.oracle.graal.word.WordTypes; /** * Defines the {@link Plugins} used when running on HotSpot.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,42 +22,89 @@ */ package com.oracle.graal.hotspot.meta; -import static com.oracle.graal.compiler.target.Backend.*; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static com.oracle.graal.hotspot.HotSpotBackend.Options.*; -import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.*; -import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.*; -import static com.oracle.graal.hotspot.HotSpotHostBackend.*; -import static com.oracle.graal.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.*; -import static com.oracle.graal.hotspot.replacements.AssertionSnippets.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.replacements.MonitorSnippets.*; -import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.*; -import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.*; -import static com.oracle.graal.hotspot.replacements.ThreadSubstitutions.*; -import static com.oracle.graal.hotspot.replacements.WriteBarrierSnippets.*; -import static com.oracle.graal.hotspot.stubs.ExceptionHandlerStub.*; -import static com.oracle.graal.hotspot.stubs.NewArrayStub.*; -import static com.oracle.graal.hotspot.stubs.NewInstanceStub.*; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; -import static com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub.*; -import static com.oracle.graal.nodes.NamedLocationIdentity.*; -import static com.oracle.graal.nodes.java.ForeignCallDescriptors.*; -import static com.oracle.graal.replacements.Log.*; -import static jdk.internal.jvmci.code.CallingConvention.Type.*; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_COS; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_EXP; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_LOG; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_LOG10; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_POW; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_SIN; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_TAN; +import static com.oracle.graal.hotspot.HotSpotBackend.DECRYPT; +import static com.oracle.graal.hotspot.HotSpotBackend.DECRYPT_BLOCK; +import static com.oracle.graal.hotspot.HotSpotBackend.ENCRYPT; +import static com.oracle.graal.hotspot.HotSpotBackend.ENCRYPT_BLOCK; +import static com.oracle.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER; +import static com.oracle.graal.hotspot.HotSpotBackend.FETCH_UNROLL_INFO; +import static com.oracle.graal.hotspot.HotSpotBackend.IC_MISS_HANDLER; +import static com.oracle.graal.hotspot.HotSpotBackend.NEW_ARRAY; +import static com.oracle.graal.hotspot.HotSpotBackend.NEW_INSTANCE; +import static com.oracle.graal.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; +import static com.oracle.graal.hotspot.HotSpotBackend.UNCOMMON_TRAP; +import static com.oracle.graal.hotspot.HotSpotBackend.UNPACK_FRAMES; +import static com.oracle.graal.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; +import static com.oracle.graal.hotspot.HotSpotBackend.VM_ERROR; +import static com.oracle.graal.hotspot.HotSpotBackend.Options.PreferGraalStubs; +import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_REGISTERS; +import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS; +import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.LEAF; +import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP; +import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.NOT_LEAF; +import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.STACK_INSPECTABLE_LEAF; +import static com.oracle.graal.hotspot.HotSpotHostBackend.DEOPTIMIZATION_HANDLER; +import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; +import static com.oracle.graal.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.CREATE_NULL_POINTER_EXCEPTION; +import static com.oracle.graal.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls.CREATE_OUT_OF_BOUNDS_EXCEPTION; +import static com.oracle.graal.hotspot.replacements.AssertionSnippets.ASSERTION_VM_MESSAGE_C; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; +import static com.oracle.graal.hotspot.replacements.MonitorSnippets.MONITORENTER; +import static com.oracle.graal.hotspot.replacements.MonitorSnippets.MONITOREXIT; +import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.DYNAMIC_NEW_ARRAY; +import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.DYNAMIC_NEW_INSTANCE; +import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.INIT_LOCATION; +import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.JAVA_TIME_MILLIS; +import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.JAVA_TIME_NANOS; +import static com.oracle.graal.hotspot.replacements.ThreadSubstitutions.THREAD_IS_INTERRUPTED; +import static com.oracle.graal.hotspot.replacements.WriteBarrierSnippets.G1WBPOSTCALL; +import static com.oracle.graal.hotspot.replacements.WriteBarrierSnippets.G1WBPRECALL; +import static com.oracle.graal.hotspot.replacements.WriteBarrierSnippets.VALIDATE_OBJECT; +import static com.oracle.graal.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC; +import static com.oracle.graal.hotspot.stubs.NewArrayStub.NEW_ARRAY_C; +import static com.oracle.graal.hotspot.stubs.NewInstanceStub.NEW_INSTANCE_C; +import static com.oracle.graal.hotspot.stubs.StubUtil.VM_MESSAGE_C; +import static com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS; +import static com.oracle.graal.nodes.NamedLocationIdentity.any; +import static com.oracle.graal.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER; +import static com.oracle.graal.replacements.Log.LOG_OBJECT; +import static com.oracle.graal.replacements.Log.LOG_PRIMITIVE; +import static com.oracle.graal.replacements.Log.LOG_PRINTF; +import static jdk.internal.jvmci.code.CallingConvention.Type.NativeCall; -import java.util.*; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; +import com.oracle.graal.hotspot.stubs.ExceptionHandlerStub; +import com.oracle.graal.hotspot.stubs.NewArrayStub; +import com.oracle.graal.hotspot.stubs.NewInstanceStub; +import com.oracle.graal.hotspot.stubs.Stub; +import com.oracle.graal.hotspot.stubs.UnwindExceptionToCallerStub; +import com.oracle.graal.hotspot.stubs.VerifyOopStub; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.word.Word; /** * HotSpot implementation of {@link ForeignCallsProvider}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LoweringProvider; /** * HotSpot implementation of {@link LoweringProvider}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNodePlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNodePlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,28 @@ */ package com.oracle.graal.hotspot.meta; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.hotspot.meta.HotSpotGraalConstantReflectionProvider.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.hotspot.meta.HotSpotGraalConstantReflectionProvider.FieldReadEnabledInImmutableCode; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.Node.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node.NodeIntrinsic; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; +import com.oracle.graal.graphbuilderconf.NodePlugin; +import com.oracle.graal.graphbuilderconf.ParameterPlugin; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.replacements.NodeIntrinsificationPlugin; +import com.oracle.graal.replacements.WordOperationPlugin; +import com.oracle.graal.word.Word; /** * This plugin handles the HotSpot-specific customizations of bytecode parsing:
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.api.replacements.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.hotspot.word.HotSpotWordTypes; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.phases.tiers.SuitesProvider; +import com.oracle.graal.phases.util.Providers; /** * Extends {@link Providers} to include a number of extra capabilities used by the HotSpot parts of
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegisters.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegisters.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Register; public class HotSpotRegisters implements HotSpotRegistersProvider {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegistersProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegistersProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Register; /** * Special registers reserved by HotSpot for frequently used values.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntimeStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntimeStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.hotspot.stubs.*; +import com.oracle.graal.hotspot.stubs.Stub; /** * Implementation of {@link InstalledCode} for code installed as a RuntimeStub.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,11 +23,16 @@ package com.oracle.graal.hotspot.meta; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstantImpl; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider; public class HotSpotSnippetReflectionProvider implements SnippetReflectionProvider {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotStampProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotStampProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.hotspot.meta; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.nodes.type.MethodPointerStamp; +import com.oracle.graal.nodes.spi.StampProvider; public class HotSpotStampProvider implements StampProvider {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotWordOperationPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotWordOperationPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,39 @@ */ package com.oracle.graal.hotspot.meta; -import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.*; -import static com.oracle.graal.nodes.ConstantNode.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static com.oracle.graal.nodes.ConstantNode.forBoolean; +import static jdk.internal.jvmci.meta.LocationIdentity.any; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.hotspot.word.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.hotspot.nodes.LoadIndexedPointerNode; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.nodes.type.MetaspacePointerStamp; +import com.oracle.graal.hotspot.nodes.type.MethodPointerStamp; +import com.oracle.graal.hotspot.word.HotSpotOperation; import com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.hotspot.word.PointerCastNode; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.calc.PointerEqualsNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.replacements.WordOperationPlugin; +import com.oracle.graal.word.WordTypes; /** * Extends {@link WordOperationPlugin} to handle {@linkplain HotSpotOperation HotSpot word
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.hotspot.nodes; -import java.util.*; +import java.util.BitSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Reserves a block of memory in the stack frame of a method. The block is reserved in the frame for
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; @NodeInfo public abstract class ArrayRangeWriteBarrier extends WriteBarrier implements Lowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.MonitorEnter; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordTypes; /** * Intrinsic for opening a scope binding a stack-based lock with an object. A lock scope must be
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordTypes; /** * Converts a compile-time constant Java string into a C string installed with the generated code.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.replacements.nodes.MacroNode; +import com.oracle.graal.replacements.nodes.MacroStateSplitNode; /** * {@link MacroNode Macro node} for {@link Class#cast(Object)}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,32 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; +import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.nodes.type.NarrowOopStamp; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConvertNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.type.StampTool; /** * Compress or uncompress an oop or metaspace pointer.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ComputeObjectAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ComputeObjectAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * A high-level intrinsic for getting an address inside of an object. During lowering it will be
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordTypes; /** * Gets the address of the C++ JavaThread object for the current thread.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordTypes; /** * Intrinsic for getting the lock in the current {@linkplain BeginLockScopeNode lock scope}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,24 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.hotspot.HotSpotBackend.*; +import static com.oracle.graal.hotspot.HotSpotBackend.FETCH_UNROLL_INFO; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * A call to the runtime code {@code Deoptimization::fetch_unroll_info}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Removes the current frame and tail calls the uncommon trap routine.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizingStubCall.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizingStubCall.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingFixedWithNextNode; @NodeInfo public abstract class DeoptimizingStubCall extends DeoptimizingFixedWithNextNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,22 @@ */ package com.oracle.graal.hotspot.nodes; -import static com.oracle.graal.asm.NumUtil.*; +import static com.oracle.graal.asm.NumUtil.roundUp; -import java.util.*; +import java.util.BitSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordTypes; /** * Intrinsic for allocating an on-stack array of integers to hold the dimensions of a multianewarray
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotNodeLIRBuilder; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.CompareAndSwapNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.address.AddressNode; import com.oracle.graal.nodes.memory.address.AddressNode.Address; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * A special purpose store node that differs from {@link CompareAndSwapNode} in that it is not a
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.MonitorExit; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Intrinsic for closing a {@linkplain BeginLockScopeNode scope} binding a stack-based lock with an
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * Emits code to enter a low-level stack frame specifically to call out to the C++ method
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePostWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePostWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public class G1ArrayRangePostWriteBarrier extends ArrayRangeWriteBarrier {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePreWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ArrayRangePreWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public final class G1ArrayRangePreWriteBarrier extends ArrayRangeWriteBarrier {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; @NodeInfo public class G1PostWriteBarrier extends ObjectWriteBarrier {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; @NodeInfo public final class G1PreWriteBarrier extends ObjectWriteBarrier implements DeoptimizingNode.DeoptBefore {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; /** * The {@code G1ReferentFieldReadBarrier} is added when a read access is performed to the referent
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.replacements.Snippet; /** * Intrinsification for getting the address of an object. The code path(s) between a call to
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DirectCallTargetNode; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public final class HotSpotDirectCallTargetNode extends DirectCallTargetNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.CallingConvention.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.IndirectCallTargetNode; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public final class HotSpotIndirectCallTargetNode extends IndirectCallTargetNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotNodeLIRBuilder; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * Sets up the {@linkplain HotSpotBackend#EXCEPTION_HANDLER_IN_CALLER arguments} expected by an
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotNodeLIRBuilder; +import com.oracle.graal.hotspot.stubs.ExceptionHandlerStub; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * Jumps to the exception handler specified by {@link #address}. This node is specific for the
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveCurrentStackFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveCurrentStackFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Emits code to leave (pop) the current low-level stack frame. This operation also removes the
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.hotspot.stubs.DeoptimizationStub; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * Emits code to leave (pop) the current low-level stack frame which is being deoptimized. This node
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveUnpackFramesStackFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveUnpackFramesStackFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Emits code to leave a low-level stack frame specifically to call out to the C++ method
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LoadIndexedPointerNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LoadIndexedPointerNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; @NodeInfo public final class LoadIndexedPointerNode extends LoadIndexedNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,19 @@ */ package com.oracle.graal.hotspot.nodes; -import java.util.*; +import java.util.BitSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordTypes; /** * Node that is used to maintain a stack based counter of how many locks are currently held.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ObjectWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ObjectWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; @NodeInfo public abstract class ObjectWriteBarrier extends WriteBarrier {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotNodeLIRBuilder; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * Modifies the return address of the current frame.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PrefetchAllocateNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,14 +23,17 @@ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; import com.oracle.graal.nodes.memory.address.AddressNode.Address; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class PrefetchAllocateNode extends FixedWithNextNode implements LIRLowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * A call to the runtime code implementing the uncommon trap logic.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Saves all allocatable registers.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialArrayRangeWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialArrayRangeWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public final class SerialArrayRangeWriteBarrier extends ArrayRangeWriteBarrier {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.memory.address.AddressNode; @NodeInfo public class SerialWriteBarrier extends ObjectWriteBarrier {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetAnchorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetAnchorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.extended.GuardingNode; @NodeInfo(allowedUsageTypes = {InputType.Value, InputType.Anchor, InputType.Guard}) public final class SnippetAnchorNode extends FixedWithNextNode implements Simplifiable, GuardingNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetLocationProxyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SnippetLocationProxyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.GuardingNode; @NodeInfo(allowedUsageTypes = {InputType.Association, InputType.Value}) public final class SnippetLocationProxyNode extends FloatingNode implements Canonicalizable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,27 @@ */ package com.oracle.graal.hotspot.nodes; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.replacements.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Node for a {@linkplain ForeignCallDescriptor foreign} call from within a stub.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubStartNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubStartNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.stubs.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.stubs.Stub; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.StartNode; /** * Start node for a {@link Stub}'s graph.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,24 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.hotspot.HotSpotBackend.*; +import static com.oracle.graal.hotspot.HotSpotBackend.UNCOMMON_TRAP; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.word.Word; /** * A call to the runtime code implementing the uncommon trap logic.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static com.oracle.graal.hotspot.nodes.CStringNode.*; +import static com.oracle.graal.hotspot.HotSpotBackend.VM_ERROR; +import static com.oracle.graal.hotspot.nodes.CStringNode.emitCString; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.replacements.Log; /** * Causes the VM to exit with a description of the current Java location and an optional
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo public abstract class WriteBarrier extends FixedWithNextNode implements Lowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/HotSpotLIRKindTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/HotSpotLIRKindTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; /** * Extension of {@link LIRKindTool} that includes support for compressed pointer kinds.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/KlassPointerStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/KlassPointerStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.hotspot.nodes.type; -import java.util.*; +import java.util.Objects; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; +import jdk.internal.jvmci.hotspot.HotSpotMemoryAccessProvider; +import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.Stamp; public final class KlassPointerStamp extends MetaspacePointerStamp {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MetaspacePointerStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MetaspacePointerStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.Stamp; public abstract class MetaspacePointerStamp extends AbstractPointerStamp {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MethodPointerStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MethodPointerStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,15 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotMemoryAccessProvider; +import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.Stamp; public final class MethodPointerStamp extends MetaspacePointerStamp {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/NarrowOopStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/NarrowOopStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,19 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; +import jdk.internal.jvmci.hotspot.HotSpotMemoryAccessProvider; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; public class NarrowOopStamp extends AbstractObjectStamp {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.hotspot.phases; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.nodes.ConstantNode.*; +import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.phases.VerifyPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Checks for {@link #isIllegalObjectConstant(ConstantNode) illegal} object constants in a graph
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,35 @@ */ package com.oracle.graal.hotspot.phases; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.nodes.ConstantNode.*; -import static com.oracle.graal.nodes.NamedLocationIdentity.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.CLASS_MIRROR_LOCATION; +import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; +import static com.oracle.graal.nodes.NamedLocationIdentity.FINAL_LOCATION; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.hotspot.HotSpotResolvedPrimitiveType; import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.hotspot.nodes.CompressionNode; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.nodes.type.NarrowOopStamp; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * For AOT compilation we aren't allowed to use a {@link Class} reference ({@code javaMirror})
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,32 @@ */ package com.oracle.graal.hotspot.phases; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.common.JVMCIError; import jdk.internal.jvmci.compiler.Compiler; -import com.oracle.graal.debug.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.loop.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopTransformations; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.EntryMarkerNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.OSRLocalNode; +import com.oracle.graal.nodes.extended.OSRStartNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; public class OnStackReplacementPhase extends Phase {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,29 @@ */ package com.oracle.graal.hotspot.phases; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.hotspot.nodes.G1ArrayRangePostWriteBarrier; +import com.oracle.graal.hotspot.nodes.G1ArrayRangePreWriteBarrier; +import com.oracle.graal.hotspot.nodes.G1PostWriteBarrier; +import com.oracle.graal.hotspot.nodes.G1PreWriteBarrier; +import com.oracle.graal.hotspot.nodes.G1ReferentFieldReadBarrier; +import com.oracle.graal.hotspot.nodes.SerialArrayRangeWriteBarrier; +import com.oracle.graal.hotspot.nodes.SerialWriteBarrier; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.ArrayRangeWriteNode; +import com.oracle.graal.nodes.java.LoweredAtomicReadAndWriteNode; +import com.oracle.graal.nodes.java.LoweredCompareAndSwapNode; +import com.oracle.graal.nodes.memory.FixedAccessNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.WriteNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.phases.Phase; public class WriteBarrierAdditionPhase extends Phase {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AssertionSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AssertionSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,26 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.nodes.CStringNode.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; -import jdk.internal.jvmci.code.*; +import static com.oracle.graal.hotspot.nodes.CStringNode.cstring; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.StubStartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; -import com.oracle.graal.replacements.nodes.*; -import com.oracle.graal.word.*; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.replacements.nodes.AssertionNode; +import com.oracle.graal.word.Word; public class AssertionSnippets implements Snippets {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,25 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.nodes.MacroStateSplitNode; @NodeInfo public final class CallSiteTargetNode extends MacroStateSplitNode implements Canonicalizable, Lowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class CardTableAddressNode extends FloatingNode implements LIRLowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableShiftNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableShiftNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.hotspot.HotSpotLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class CardTableShiftNode extends FloatingNode implements LIRLowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,36 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.*; -import static com.oracle.graal.nodes.PiNode.*; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.verifyOop; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.checkUnknownSubType; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.isNull; +import static com.oracle.graal.nodes.PiNode.piCast; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.ClassCastException; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.SnippetAnchorNode; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.java.CheckCastDynamicNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.Snippet; +import com.oracle.graal.replacements.SnippetTemplate; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; +import com.oracle.graal.replacements.Snippets; /** * Snippet used for lowering {@link CheckCastDynamicNode}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,34 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.hotspot.HotSpotResolvedPrimitiveType; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FloatingGuardedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConvertNode; +import com.oracle.graal.nodes.extended.GetClassNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Read {@code Class::_klass} to get the hub for a {@link java.lang.Class}. This node mostly exists
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ConstantPoolSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ConstantPoolSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.INSTANCE_KLASS_CONSTANTS; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.constantPoolLengthOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.constantPoolSize; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.instanceKlassConstantsOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import sun.reflect.ConstantPool; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.word.*; - -import sun.reflect.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.word.Word; /** * Substitutions for {@link sun.reflect.ConstantPool} methods.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotClassSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotClassSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,20 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassComponentMirrorOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.klassAccessFlagsOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.klassIsArray; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.klassModifierFlagsOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.klassSuperKlassOffset; -import java.lang.reflect.*; +import java.lang.reflect.Modifier; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodes.PiNode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.service.*; -import sun.reflect.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.service.ServiceProvider; import sun.reflect.ConstantPool; +import sun.reflect.Reflection; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.spi.ReplacementsProvider; @ServiceProvider(ReplacementsProvider.class) public class HotSpotSubstitutions implements ReplacementsProvider {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,27 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.hotspot.HotSpotResolvedPrimitiveType; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FloatingGuardedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConvertNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Read {@code Klass::_java_mirror} and incorporate non-null type information into stamp. This is
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/IdentityHashCodeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/IdentityHashCodeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.replacements.nodes.PureFunctionMacroNode; @NodeInfo public final class IdentityHashCodeNode extends PureFunctionMacroNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,42 +22,73 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.replacements.InstanceOfSnippets.Options.*; -import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.*; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; +import static com.oracle.graal.hotspot.replacements.InstanceOfSnippets.Options.TypeCheckMaxHints; +import static com.oracle.graal.hotspot.replacements.InstanceOfSnippets.Options.TypeCheckMinProfileHitProbability; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.checkSecondarySubType; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.checkUnknownSubType; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.createHints; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.displayHit; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.displayMiss; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.exactHit; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.exactMiss; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.hintsHit; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.hintsMiss; +import static com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.isNull; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.OptimizedTypeCheckViolated; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.TriState; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.nodes.type.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.SnippetAnchorNode; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; import com.oracle.graal.hotspot.replacements.TypeCheckSnippetUtils.Hints; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.TypeCheckHints; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.BranchProbabilityNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.java.ClassIsAssignableFromNode; +import com.oracle.graal.nodes.java.InstanceOfDynamicNode; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.java.TypeCheckNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.InstanceOfSnippetsTemplates; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; import com.oracle.graal.replacements.Snippet.VarargsParameter; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.replacements.nodes.ExplodeLoopNode; /** * Snippets used for implementing the type test of an instanceof instruction. Since instanceof is a * floating node, it is lowered separately for each of its usages. * - * The type tests implemented are described in the paper <a - * href="http://dl.acm.org/citation.cfm?id=583821"> Fast subtype checking in the HotSpot JVM</a> by - * Cliff Click and John Rose. + * The type tests implemented are described in the paper + * <a href="http://dl.acm.org/citation.cfm?id=583821"> Fast subtype checking in the HotSpot JVM</a> + * by Cliff Click and John Rose. */ public class InstanceOfSnippets implements Snippets {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/KlassLayoutHelperNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/KlassLayoutHelperNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,27 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FloatingGuardedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Read {@code Klass::_layout_helper} and incorporate any useful stamp information based on any type
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/LoadExceptionObjectSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/LoadExceptionObjectSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,34 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.nodes.PiNode.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; -import jdk.internal.jvmci.code.*; +import static com.oracle.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.LOAD_AND_CLEAR_EXCEPTION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_OOP_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_PC_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; +import static com.oracle.graal.nodes.PiNode.piCast; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.java.LoadExceptionObjectNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; -import com.oracle.graal.replacements.nodes.*; -import com.oracle.graal.word.*; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.replacements.nodes.ReadRegisterNode; +import com.oracle.graal.word.Word; /** * Snippet for loading the exception object at the start of an exception dispatcher.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,45 +22,92 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.hotspot.nodes.BeginLockScopeNode.*; -import static com.oracle.graal.hotspot.nodes.DirectCompareAndSwapNode.*; -import static com.oracle.graal.hotspot.nodes.EndLockScopeNode.*; -import static com.oracle.graal.hotspot.nodes.VMErrorNode.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; +import static com.oracle.graal.compiler.common.GraalOptions.SnippetCounters; +import static com.oracle.graal.hotspot.nodes.BeginLockScopeNode.beginLockScope; +import static com.oracle.graal.hotspot.nodes.DirectCompareAndSwapNode.compareAndSwap; +import static com.oracle.graal.hotspot.nodes.EndLockScopeNode.endLockScope; +import static com.oracle.graal.hotspot.nodes.VMErrorNode.vmError; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.PROTOTYPE_MARK_WORD_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.ageMaskInPlace; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.biasedLockMaskInPlace; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.biasedLockPattern; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.config; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.epochMaskInPlace; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.lockDisplacedMarkOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.markOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.pageSize; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.prototypeMarkWordOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.useBiasedLocking; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.verifyOop; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; +import com.oracle.graal.hotspot.nodes.CurrentLockNode; +import com.oracle.graal.hotspot.nodes.DirectCompareAndSwapNode; +import com.oracle.graal.hotspot.nodes.MonitorCounterNode; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodes.BreakpointNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.debug.DynamicCounterNode; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.MonitorExitNode; +import com.oracle.graal.nodes.java.RawMonitorEnterNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.replacements.Log; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; +import com.oracle.graal.replacements.SnippetCounter; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; -import com.oracle.graal.word.*; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordBase; /** * Snippets used for implementing the monitorenter and monitorexit instructions.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,33 @@ */ package com.oracle.graal.hotspot.replacements; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.replacements.nodes.BasicObjectCloneNode; @NodeInfo public final class ObjectCloneNode extends BasicObjectCloneNode implements VirtualizableAllocation, ArrayLengthProvider {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.hotspot.replacements; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Method; +import java.util.EnumMap; + +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.api.directives.*; -import com.oracle.graal.hotspot.replacements.arraycopy.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.hotspot.replacements.arraycopy.ArrayCopyCallNode; +import com.oracle.graal.nodes.java.DynamicNewArrayNode; +import com.oracle.graal.nodes.java.NewArrayNode; +import com.oracle.graal.replacements.Snippet; +import com.oracle.graal.replacements.Snippets; public class ObjectCloneSnippets implements Snippets {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.computeHashCode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,26 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.nodes.MacroStateSplitNode; @NodeInfo public final class ReflectionGetCallerClassNode extends MacroStateSplitNode implements Canonicalizable, Lowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; - -import java.lang.reflect.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.jvmAccWrittenFlags; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.klassAccessFlagsOffset; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.hotspot.word.*; +import java.lang.reflect.Modifier; + +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.hotspot.word.KlassPointer; /** * Substitutions for {@link sun.reflect.Reflection} methods.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/SystemSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/SystemSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.computeHashCode; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; + +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; /** * Substitutions for {@link java.lang.System} methods.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.osThreadInterruptedOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.osThreadOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.threadObjectOffset; +import static jdk.internal.jvmci.meta.LocationIdentity.any; + +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.word.*; +import com.oracle.graal.hotspot.nodes.CurrentJavaThreadNode; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.word.Word; /** * Substitutions for {@link java.lang.Thread} methods.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/TypeCheckSnippetUtils.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/TypeCheckSnippetUtils.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,34 @@ */ package com.oracle.graal.hotspot.replacements; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; - -import java.util.*; +import static com.oracle.graal.compiler.common.GraalOptions.SnippetCounters; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_CHECK_OFFSET_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.METASPACE_ARRAY_LENGTH_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPERS_ELEMENT_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPERS_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.metaspaceArrayBaseOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.metaspaceArrayLengthOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.secondarySuperCacheOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.secondarySupersOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.superCheckOffsetOffset; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; -import jdk.internal.jvmci.hotspot.*; -import jdk.internal.jvmci.meta.*; +import java.util.Arrays; + +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.TypeCheckHints; +import com.oracle.graal.replacements.SnippetCounter; +import com.oracle.graal.word.Word; //JaCoCo Exclude
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeLoadSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeLoadSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,21 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.code.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.referentOffset; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.nodes.extended.FixedValueAnchorNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; -import com.oracle.graal.word.*; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.Word; public class UnsafeLoadSnippets implements Snippets {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.replacements.nodes.BasicArrayCopyNode; @NodeInfo public final class ArrayCopyNode extends BasicArrayCopyNode implements Virtualizable, Lowerable {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.replacements.SnippetTemplate; +import com.oracle.graal.replacements.nodes.BasicArrayCopyNode; @NodeInfo public final class ArrayCopySlowPathNode extends BasicArrayCopyNode {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -35,6 +35,7 @@ import static com.oracle.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; + import java.lang.reflect.Method; import java.util.EnumMap; import java.util.Map;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.meta.LocationIdentity.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.ArrayRangeWriteNode; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo public class ArrayCopyUnrollNode extends ArrayRangeWriteNode implements MemoryCheckpoint.Single, Lowerable, MemoryAccess {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.ArrayRangeWriteNode; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; import com.oracle.graal.replacements.SnippetTemplate.Arguments; @NodeInfo(allowedUsageTypes = {InputType.Memory})
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/DeoptimizationStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/DeoptimizationStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,37 @@ */ package com.oracle.graal.hotspot.stubs; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.hotspot.*; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static com.oracle.graal.hotspot.HotSpotBackend.Options.*; -import static com.oracle.graal.hotspot.nodes.DeoptimizationFetchUnrollInfoCallNode.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.stubs.UncommonTrapStub.*; +import static com.oracle.graal.hotspot.HotSpotBackend.UNPACK_FRAMES; +import static com.oracle.graal.hotspot.HotSpotBackend.Options.PreferGraalStubs; +import static com.oracle.graal.hotspot.nodes.DeoptimizationFetchUnrollInfoCallNode.fetchUnrollInfo; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.config; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.pageSize; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeRegisterAsWord; +import static com.oracle.graal.hotspot.stubs.UncommonTrapStub.STACK_BANG_LOCATION; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.EnterUnpackFramesStackFrameNode; +import com.oracle.graal.hotspot.nodes.LeaveCurrentStackFrameNode; +import com.oracle.graal.hotspot.nodes.LeaveDeoptimizedStackFrameNode; +import com.oracle.graal.hotspot.nodes.LeaveUnpackFramesStackFrameNode; +import com.oracle.graal.hotspot.nodes.PushInterpreterFrameNode; +import com.oracle.graal.hotspot.nodes.SaveAllRegistersNode; +import com.oracle.graal.hotspot.nodes.StubForeignCallNode; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Word; /** * Deoptimization stub.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,32 @@ */ package com.oracle.graal.hotspot.stubs; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import static com.oracle.graal.hotspot.nodes.JumpToExceptionHandlerNode.*; -import static com.oracle.graal.hotspot.nodes.PatchReturnAddressNode.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; +import static com.oracle.graal.hotspot.nodes.JumpToExceptionHandlerNode.jumpToExceptionHandler; +import static com.oracle.graal.hotspot.nodes.PatchReturnAddressNode.patchReturnAddress; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.readExceptionPc; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; +import static com.oracle.graal.hotspot.stubs.StubUtil.cAssertionsEnabled; +import static com.oracle.graal.hotspot.stubs.StubUtil.decipher; +import static com.oracle.graal.hotspot.stubs.StubUtil.fatal; +import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; +import static com.oracle.graal.hotspot.stubs.StubUtil.printf; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.HotSpotBackend; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.StubForeignCallNode; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Word; /** * Stub called by the {@linkplain HotSpotVMConfig#MARKID_EXCEPTION_HANDLER_ENTRY exception handler
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,42 @@ */ package com.oracle.graal.hotspot.stubs; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.*; -import static com.oracle.graal.hotspot.stubs.NewInstanceStub.*; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; -import static jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.hotspot.*; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.arrayPrototypeMarkWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.getAndClearObjectResult; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperElementTypeMask; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperElementTypeShift; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeMask; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeShift; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeMask; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeShift; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.loadKlassLayoutHelperIntrinsic; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.MAX_ARRAY_FAST_PATH_ALLOCATION_LENGTH; +import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.formatArray; +import static com.oracle.graal.hotspot.stubs.NewInstanceStub.refillAllocate; +import static com.oracle.graal.hotspot.stubs.StubUtil.handlePendingException; +import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; +import static com.oracle.graal.hotspot.stubs.StubUtil.printf; +import static com.oracle.graal.hotspot.stubs.StubUtil.verifyObject; +import static jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider.computeArrayAllocationSize; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; + +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.hotspot.replacements.*; -import com.oracle.graal.hotspot.word.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.StubForeignCallNode; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.replacements.NewObjectSnippets; +import com.oracle.graal.hotspot.word.KlassPointer; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Word; /** * Stub implementing the fast path for TLAB refill during instance class allocation. This stub is
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,31 +22,37 @@ */ package com.oracle.graal.hotspot.stubs; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Local; +import jdk.internal.jvmci.meta.LocalVariableTable; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; import com.oracle.graal.nodes.StructuredGraph.GuardsStage; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.replacements.ConstantBindingParameterPlugin; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; +import com.oracle.graal.replacements.SnippetTemplate; +import com.oracle.graal.replacements.Snippets; /** * Base class for a stub defined by a snippet.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,39 @@ */ package com.oracle.graal.hotspot.stubs; -import static com.oracle.graal.hotspot.HotSpotBackend.*; -import static com.oracle.graal.hotspot.HotSpotBackend.Options.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.hotspot.HotSpotBackend.UNPACK_FRAMES; +import static com.oracle.graal.hotspot.HotSpotBackend.Options.PreferGraalStubs; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.config; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.pageSize; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.readPendingDeoptimization; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writePendingDeoptimization; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeRegisterAsWord; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.EnterUnpackFramesStackFrameNode; +import com.oracle.graal.hotspot.nodes.LeaveCurrentStackFrameNode; +import com.oracle.graal.hotspot.nodes.LeaveDeoptimizedStackFrameNode; +import com.oracle.graal.hotspot.nodes.LeaveUnpackFramesStackFrameNode; +import com.oracle.graal.hotspot.nodes.PushInterpreterFrameNode; +import com.oracle.graal.hotspot.nodes.SaveAllRegistersNode; +import com.oracle.graal.hotspot.nodes.StubForeignCallNode; +import com.oracle.graal.hotspot.nodes.UncommonTrapCallNode; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Word; /** * Uncommon trap stub.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,28 @@ */ package com.oracle.graal.hotspot.stubs; -import jdk.internal.jvmci.code.*; -import static com.oracle.graal.hotspot.nodes.JumpToExceptionHandlerInCallerNode.*; -import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; -import static com.oracle.graal.hotspot.stubs.ExceptionHandlerStub.*; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; +import static com.oracle.graal.hotspot.nodes.JumpToExceptionHandlerInCallerNode.jumpToExceptionHandlerInCaller; +import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static com.oracle.graal.hotspot.stubs.ExceptionHandlerStub.checkExceptionNotNull; +import static com.oracle.graal.hotspot.stubs.ExceptionHandlerStub.checkNoExceptionInThread; +import static com.oracle.graal.hotspot.stubs.StubUtil.cAssertionsEnabled; +import static com.oracle.graal.hotspot.stubs.StubUtil.decipher; +import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; +import static com.oracle.graal.hotspot.stubs.StubUtil.printf; +import jdk.internal.jvmci.code.Register; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.hotspot.nodes.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.hotspot.nodes.StubForeignCallNode; +import com.oracle.graal.nodes.UnwindNode; +import com.oracle.graal.replacements.Snippet; import com.oracle.graal.replacements.Snippet.ConstantParameter; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Pointer; +import com.oracle.graal.word.Word; /** * Stub called by an {@link UnwindNode}. This stub executes in the frame of the method throwing an
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VerifyOopStub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/VerifyOopStub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.hotspot.stubs; -import static com.oracle.graal.hotspot.stubs.StubUtil.*; +import static com.oracle.graal.hotspot.stubs.StubUtil.verifyObject; -import com.oracle.graal.hotspot.*; -import com.oracle.graal.hotspot.meta.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; +import com.oracle.graal.hotspot.meta.HotSpotHostForeignCallsProvider; +import com.oracle.graal.hotspot.meta.HotSpotProviders; +import com.oracle.graal.replacements.Snippet; /** * Stub called via {@link HotSpotHostForeignCallsProvider#VERIFY_OOP}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotOperation.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotOperation.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.hotspot.word; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD)
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypes.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypes.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.hotspot.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.hotspot.nodes.type.*; -import com.oracle.graal.word.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; +import com.oracle.graal.hotspot.nodes.type.MethodPointerStamp; +import com.oracle.graal.word.WordTypes; /** * Extends {@link WordTypes} with information about HotSpot metaspace pointer types.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/KlassPointer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/KlassPointer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.hotspot.word; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.*; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.READ_KLASS_POINTER; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.TO_KLASS_POINTER; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Pointer; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/MetaspacePointer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/MetaspacePointer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.hotspot.word; -import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.FROM_POINTER; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.IS_NULL; +import jdk.internal.jvmci.meta.LocationIdentity; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Pointer; +import com.oracle.graal.word.Signed; +import com.oracle.graal.word.Unsigned; +import com.oracle.graal.word.Word; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation; +import com.oracle.graal.word.WordBase; /** * Marker type for a metaspace pointer.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/MethodPointer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/MethodPointer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.hotspot.word; -import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.*; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.TO_METHOD_POINTER; -import com.oracle.graal.word.*; +import com.oracle.graal.word.Pointer; /** * Marker type for a metaspace pointer to a method.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/PointerCastNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/PointerCastNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.graal.hotspot.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Cast between Word and metaspace pointers exposed by the {@link HotspotOpcode#FROM_POINTER} and
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,83 @@ */ package com.oracle.graal.java; -import static com.oracle.graal.bytecode.Bytecodes.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; - -import java.util.*; +import static com.oracle.graal.bytecode.Bytecodes.AALOAD; +import static com.oracle.graal.bytecode.Bytecodes.AASTORE; +import static com.oracle.graal.bytecode.Bytecodes.ARETURN; +import static com.oracle.graal.bytecode.Bytecodes.ARRAYLENGTH; +import static com.oracle.graal.bytecode.Bytecodes.ATHROW; +import static com.oracle.graal.bytecode.Bytecodes.BALOAD; +import static com.oracle.graal.bytecode.Bytecodes.BASTORE; +import static com.oracle.graal.bytecode.Bytecodes.CALOAD; +import static com.oracle.graal.bytecode.Bytecodes.CASTORE; +import static com.oracle.graal.bytecode.Bytecodes.DALOAD; +import static com.oracle.graal.bytecode.Bytecodes.DASTORE; +import static com.oracle.graal.bytecode.Bytecodes.DRETURN; +import static com.oracle.graal.bytecode.Bytecodes.FALOAD; +import static com.oracle.graal.bytecode.Bytecodes.FASTORE; +import static com.oracle.graal.bytecode.Bytecodes.FRETURN; +import static com.oracle.graal.bytecode.Bytecodes.GETFIELD; +import static com.oracle.graal.bytecode.Bytecodes.GOTO; +import static com.oracle.graal.bytecode.Bytecodes.GOTO_W; +import static com.oracle.graal.bytecode.Bytecodes.IALOAD; +import static com.oracle.graal.bytecode.Bytecodes.IASTORE; +import static com.oracle.graal.bytecode.Bytecodes.IFEQ; +import static com.oracle.graal.bytecode.Bytecodes.IFGE; +import static com.oracle.graal.bytecode.Bytecodes.IFGT; +import static com.oracle.graal.bytecode.Bytecodes.IFLE; +import static com.oracle.graal.bytecode.Bytecodes.IFLT; +import static com.oracle.graal.bytecode.Bytecodes.IFNE; +import static com.oracle.graal.bytecode.Bytecodes.IFNONNULL; +import static com.oracle.graal.bytecode.Bytecodes.IFNULL; +import static com.oracle.graal.bytecode.Bytecodes.IF_ACMPEQ; +import static com.oracle.graal.bytecode.Bytecodes.IF_ACMPNE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPEQ; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPGE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPGT; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPLE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPLT; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPNE; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEDYNAMIC; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEINTERFACE; +import static com.oracle.graal.bytecode.Bytecodes.INVOKESPECIAL; +import static com.oracle.graal.bytecode.Bytecodes.INVOKESTATIC; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEVIRTUAL; +import static com.oracle.graal.bytecode.Bytecodes.IRETURN; +import static com.oracle.graal.bytecode.Bytecodes.JSR; +import static com.oracle.graal.bytecode.Bytecodes.JSR_W; +import static com.oracle.graal.bytecode.Bytecodes.LALOAD; +import static com.oracle.graal.bytecode.Bytecodes.LASTORE; +import static com.oracle.graal.bytecode.Bytecodes.LOOKUPSWITCH; +import static com.oracle.graal.bytecode.Bytecodes.LRETURN; +import static com.oracle.graal.bytecode.Bytecodes.PUTFIELD; +import static com.oracle.graal.bytecode.Bytecodes.RET; +import static com.oracle.graal.bytecode.Bytecodes.RETURN; +import static com.oracle.graal.bytecode.Bytecodes.SALOAD; +import static com.oracle.graal.bytecode.Bytecodes.SASTORE; +import static com.oracle.graal.bytecode.Bytecodes.TABLESWITCH; +import static com.oracle.graal.compiler.common.GraalOptions.SupportJsrBytecodes; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; -import com.oracle.graal.bytecode.*; -import com.oracle.graal.compiler.common.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.ExceptionHandler; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; + +import com.oracle.graal.bytecode.BytecodeLookupSwitch; +import com.oracle.graal.bytecode.BytecodeStream; +import com.oracle.graal.bytecode.BytecodeSwitch; +import com.oracle.graal.bytecode.BytecodeTableSwitch; +import com.oracle.graal.bytecode.Bytecodes; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.debug.Debug; /** * Builds a mapping between bytecodes and basic blocks and builds a conservative control flow graph
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeDisassembler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeDisassembler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,71 @@ */ package com.oracle.graal.java; -import static com.oracle.graal.bytecode.Bytecodes.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD; +import static com.oracle.graal.bytecode.Bytecodes.ANEWARRAY; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE; +import static com.oracle.graal.bytecode.Bytecodes.BIPUSH; +import static com.oracle.graal.bytecode.Bytecodes.CHECKCAST; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE; +import static com.oracle.graal.bytecode.Bytecodes.GETFIELD; +import static com.oracle.graal.bytecode.Bytecodes.GETSTATIC; +import static com.oracle.graal.bytecode.Bytecodes.GOTO; +import static com.oracle.graal.bytecode.Bytecodes.GOTO_W; +import static com.oracle.graal.bytecode.Bytecodes.IFEQ; +import static com.oracle.graal.bytecode.Bytecodes.IFGE; +import static com.oracle.graal.bytecode.Bytecodes.IFGT; +import static com.oracle.graal.bytecode.Bytecodes.IFLE; +import static com.oracle.graal.bytecode.Bytecodes.IFLT; +import static com.oracle.graal.bytecode.Bytecodes.IFNE; +import static com.oracle.graal.bytecode.Bytecodes.IFNONNULL; +import static com.oracle.graal.bytecode.Bytecodes.IFNULL; +import static com.oracle.graal.bytecode.Bytecodes.IF_ACMPEQ; +import static com.oracle.graal.bytecode.Bytecodes.IF_ACMPNE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPEQ; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPGE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPGT; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPLE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPLT; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPNE; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD; +import static com.oracle.graal.bytecode.Bytecodes.INSTANCEOF; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEDYNAMIC; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEINTERFACE; +import static com.oracle.graal.bytecode.Bytecodes.INVOKESPECIAL; +import static com.oracle.graal.bytecode.Bytecodes.INVOKESTATIC; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEVIRTUAL; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE; +import static com.oracle.graal.bytecode.Bytecodes.JSR; +import static com.oracle.graal.bytecode.Bytecodes.JSR_W; +import static com.oracle.graal.bytecode.Bytecodes.LDC; +import static com.oracle.graal.bytecode.Bytecodes.LDC2_W; +import static com.oracle.graal.bytecode.Bytecodes.LDC_W; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD; +import static com.oracle.graal.bytecode.Bytecodes.LOOKUPSWITCH; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE; +import static com.oracle.graal.bytecode.Bytecodes.MULTIANEWARRAY; +import static com.oracle.graal.bytecode.Bytecodes.NEW; +import static com.oracle.graal.bytecode.Bytecodes.NEWARRAY; +import static com.oracle.graal.bytecode.Bytecodes.PUTFIELD; +import static com.oracle.graal.bytecode.Bytecodes.PUTSTATIC; +import static com.oracle.graal.bytecode.Bytecodes.RET; +import static com.oracle.graal.bytecode.Bytecodes.SIPUSH; +import static com.oracle.graal.bytecode.Bytecodes.TABLESWITCH; +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 com.oracle.graal.bytecode.*; +import com.oracle.graal.bytecode.BytecodeLookupSwitch; +import com.oracle.graal.bytecode.BytecodeStream; +import com.oracle.graal.bytecode.BytecodeSwitch; +import com.oracle.graal.bytecode.BytecodeTableSwitch; +import com.oracle.graal.bytecode.Bytecodes; /** * Utility for producing a {@code javap}-like disassembly of bytecode.
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,52 +22,400 @@ */ package com.oracle.graal.java; -import static com.oracle.graal.bytecode.Bytecodes.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.compiler.common.type.StampFactory.*; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; -import static com.oracle.graal.java.BytecodeParser.Options.*; -import static com.oracle.graal.nodes.type.StampTool.*; -import static java.lang.String.*; -import static jdk.internal.jvmci.common.JVMCIError.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; - -import java.util.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; +import static com.oracle.graal.bytecode.Bytecodes.AALOAD; +import static com.oracle.graal.bytecode.Bytecodes.AASTORE; +import static com.oracle.graal.bytecode.Bytecodes.ACONST_NULL; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.ANEWARRAY; +import static com.oracle.graal.bytecode.Bytecodes.ARETURN; +import static com.oracle.graal.bytecode.Bytecodes.ARRAYLENGTH; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.ATHROW; +import static com.oracle.graal.bytecode.Bytecodes.BALOAD; +import static com.oracle.graal.bytecode.Bytecodes.BASTORE; +import static com.oracle.graal.bytecode.Bytecodes.BIPUSH; +import static com.oracle.graal.bytecode.Bytecodes.BREAKPOINT; +import static com.oracle.graal.bytecode.Bytecodes.CALOAD; +import static com.oracle.graal.bytecode.Bytecodes.CASTORE; +import static com.oracle.graal.bytecode.Bytecodes.CHECKCAST; +import static com.oracle.graal.bytecode.Bytecodes.D2F; +import static com.oracle.graal.bytecode.Bytecodes.D2I; +import static com.oracle.graal.bytecode.Bytecodes.D2L; +import static com.oracle.graal.bytecode.Bytecodes.DADD; +import static com.oracle.graal.bytecode.Bytecodes.DALOAD; +import static com.oracle.graal.bytecode.Bytecodes.DASTORE; +import static com.oracle.graal.bytecode.Bytecodes.DCMPG; +import static com.oracle.graal.bytecode.Bytecodes.DCMPL; +import static com.oracle.graal.bytecode.Bytecodes.DCONST_0; +import static com.oracle.graal.bytecode.Bytecodes.DCONST_1; +import static com.oracle.graal.bytecode.Bytecodes.DDIV; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.DMUL; +import static com.oracle.graal.bytecode.Bytecodes.DNEG; +import static com.oracle.graal.bytecode.Bytecodes.DREM; +import static com.oracle.graal.bytecode.Bytecodes.DRETURN; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.DSUB; +import static com.oracle.graal.bytecode.Bytecodes.DUP; +import static com.oracle.graal.bytecode.Bytecodes.DUP2; +import static com.oracle.graal.bytecode.Bytecodes.DUP2_X1; +import static com.oracle.graal.bytecode.Bytecodes.DUP2_X2; +import static com.oracle.graal.bytecode.Bytecodes.DUP_X1; +import static com.oracle.graal.bytecode.Bytecodes.DUP_X2; +import static com.oracle.graal.bytecode.Bytecodes.F2D; +import static com.oracle.graal.bytecode.Bytecodes.F2I; +import static com.oracle.graal.bytecode.Bytecodes.F2L; +import static com.oracle.graal.bytecode.Bytecodes.FADD; +import static com.oracle.graal.bytecode.Bytecodes.FALOAD; +import static com.oracle.graal.bytecode.Bytecodes.FASTORE; +import static com.oracle.graal.bytecode.Bytecodes.FCMPG; +import static com.oracle.graal.bytecode.Bytecodes.FCMPL; +import static com.oracle.graal.bytecode.Bytecodes.FCONST_0; +import static com.oracle.graal.bytecode.Bytecodes.FCONST_1; +import static com.oracle.graal.bytecode.Bytecodes.FCONST_2; +import static com.oracle.graal.bytecode.Bytecodes.FDIV; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.FMUL; +import static com.oracle.graal.bytecode.Bytecodes.FNEG; +import static com.oracle.graal.bytecode.Bytecodes.FREM; +import static com.oracle.graal.bytecode.Bytecodes.FRETURN; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.FSUB; +import static com.oracle.graal.bytecode.Bytecodes.GETFIELD; +import static com.oracle.graal.bytecode.Bytecodes.GETSTATIC; +import static com.oracle.graal.bytecode.Bytecodes.GOTO; +import static com.oracle.graal.bytecode.Bytecodes.GOTO_W; +import static com.oracle.graal.bytecode.Bytecodes.I2B; +import static com.oracle.graal.bytecode.Bytecodes.I2C; +import static com.oracle.graal.bytecode.Bytecodes.I2D; +import static com.oracle.graal.bytecode.Bytecodes.I2F; +import static com.oracle.graal.bytecode.Bytecodes.I2L; +import static com.oracle.graal.bytecode.Bytecodes.I2S; +import static com.oracle.graal.bytecode.Bytecodes.IADD; +import static com.oracle.graal.bytecode.Bytecodes.IALOAD; +import static com.oracle.graal.bytecode.Bytecodes.IAND; +import static com.oracle.graal.bytecode.Bytecodes.IASTORE; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_0; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_1; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_2; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_3; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_4; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_5; +import static com.oracle.graal.bytecode.Bytecodes.ICONST_M1; +import static com.oracle.graal.bytecode.Bytecodes.IDIV; +import static com.oracle.graal.bytecode.Bytecodes.IFEQ; +import static com.oracle.graal.bytecode.Bytecodes.IFGE; +import static com.oracle.graal.bytecode.Bytecodes.IFGT; +import static com.oracle.graal.bytecode.Bytecodes.IFLE; +import static com.oracle.graal.bytecode.Bytecodes.IFLT; +import static com.oracle.graal.bytecode.Bytecodes.IFNE; +import static com.oracle.graal.bytecode.Bytecodes.IFNONNULL; +import static com.oracle.graal.bytecode.Bytecodes.IFNULL; +import static com.oracle.graal.bytecode.Bytecodes.IF_ACMPEQ; +import static com.oracle.graal.bytecode.Bytecodes.IF_ACMPNE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPEQ; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPGE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPGT; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPLE; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPLT; +import static com.oracle.graal.bytecode.Bytecodes.IF_ICMPNE; +import static com.oracle.graal.bytecode.Bytecodes.IINC; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.IMUL; +import static com.oracle.graal.bytecode.Bytecodes.INEG; +import static com.oracle.graal.bytecode.Bytecodes.INSTANCEOF; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEDYNAMIC; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEINTERFACE; +import static com.oracle.graal.bytecode.Bytecodes.INVOKESPECIAL; +import static com.oracle.graal.bytecode.Bytecodes.INVOKESTATIC; +import static com.oracle.graal.bytecode.Bytecodes.INVOKEVIRTUAL; +import static com.oracle.graal.bytecode.Bytecodes.IOR; +import static com.oracle.graal.bytecode.Bytecodes.IREM; +import static com.oracle.graal.bytecode.Bytecodes.IRETURN; +import static com.oracle.graal.bytecode.Bytecodes.ISHL; +import static com.oracle.graal.bytecode.Bytecodes.ISHR; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.ISUB; +import static com.oracle.graal.bytecode.Bytecodes.IUSHR; +import static com.oracle.graal.bytecode.Bytecodes.IXOR; +import static com.oracle.graal.bytecode.Bytecodes.JSR; +import static com.oracle.graal.bytecode.Bytecodes.JSR_W; +import static com.oracle.graal.bytecode.Bytecodes.L2D; +import static com.oracle.graal.bytecode.Bytecodes.L2F; +import static com.oracle.graal.bytecode.Bytecodes.L2I; +import static com.oracle.graal.bytecode.Bytecodes.LADD; +import static com.oracle.graal.bytecode.Bytecodes.LALOAD; +import static com.oracle.graal.bytecode.Bytecodes.LAND; +import static com.oracle.graal.bytecode.Bytecodes.LASTORE; +import static com.oracle.graal.bytecode.Bytecodes.LCMP; +import static com.oracle.graal.bytecode.Bytecodes.LCONST_0; +import static com.oracle.graal.bytecode.Bytecodes.LCONST_1; +import static com.oracle.graal.bytecode.Bytecodes.LDC; +import static com.oracle.graal.bytecode.Bytecodes.LDC2_W; +import static com.oracle.graal.bytecode.Bytecodes.LDC_W; +import static com.oracle.graal.bytecode.Bytecodes.LDIV; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.LMUL; +import static com.oracle.graal.bytecode.Bytecodes.LNEG; +import static com.oracle.graal.bytecode.Bytecodes.LOOKUPSWITCH; +import static com.oracle.graal.bytecode.Bytecodes.LOR; +import static com.oracle.graal.bytecode.Bytecodes.LREM; +import static com.oracle.graal.bytecode.Bytecodes.LRETURN; +import static com.oracle.graal.bytecode.Bytecodes.LSHL; +import static com.oracle.graal.bytecode.Bytecodes.LSHR; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.LSUB; +import static com.oracle.graal.bytecode.Bytecodes.LUSHR; +import static com.oracle.graal.bytecode.Bytecodes.LXOR; +import static com.oracle.graal.bytecode.Bytecodes.MONITORENTER; +import static com.oracle.graal.bytecode.Bytecodes.MONITOREXIT; +import static com.oracle.graal.bytecode.Bytecodes.MULTIANEWARRAY; +import static com.oracle.graal.bytecode.Bytecodes.NEW; +import static com.oracle.graal.bytecode.Bytecodes.NEWARRAY; +import static com.oracle.graal.bytecode.Bytecodes.NOP; +import static com.oracle.graal.bytecode.Bytecodes.POP; +import static com.oracle.graal.bytecode.Bytecodes.POP2; +import static com.oracle.graal.bytecode.Bytecodes.PUTFIELD; +import static com.oracle.graal.bytecode.Bytecodes.PUTSTATIC; +import static com.oracle.graal.bytecode.Bytecodes.RET; +import static com.oracle.graal.bytecode.Bytecodes.RETURN; +import static com.oracle.graal.bytecode.Bytecodes.SALOAD; +import static com.oracle.graal.bytecode.Bytecodes.SASTORE; +import static com.oracle.graal.bytecode.Bytecodes.SIPUSH; +import static com.oracle.graal.bytecode.Bytecodes.SWAP; +import static com.oracle.graal.bytecode.Bytecodes.TABLESWITCH; +import static com.oracle.graal.bytecode.Bytecodes.nameOf; +import static com.oracle.graal.compiler.common.GraalOptions.DeoptALot; +import static com.oracle.graal.compiler.common.GraalOptions.PrintProfilingInformation; +import static com.oracle.graal.compiler.common.GraalOptions.ResolveClassBeforeStaticInvoke; +import static com.oracle.graal.compiler.common.GraalOptions.StressInvokeWithExceptionNode; +import static com.oracle.graal.compiler.common.type.StampFactory.objectNonNull; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_DURING_PARSING; +import static com.oracle.graal.java.BytecodeParser.Options.DumpDuringGraphBuilding; +import static com.oracle.graal.java.BytecodeParser.Options.FailedLoopExplosionIsFatal; +import static com.oracle.graal.java.BytecodeParser.Options.MaximumLoopExplosionCount; +import static com.oracle.graal.java.BytecodeParser.Options.TraceInlineDuringParsing; +import static com.oracle.graal.java.BytecodeParser.Options.TraceParserPlugins; +import static com.oracle.graal.nodes.type.StampTool.isPointerNonNull; +import static java.lang.String.format; +import static jdk.internal.jvmci.common.JVMCIError.guarantee; +import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateRecompile; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.JavaSubroutineMismatch; +import static jdk.internal.jvmci.meta.DeoptimizationReason.NullCheckException; +import static jdk.internal.jvmci.meta.DeoptimizationReason.RuntimeConstraint; +import static jdk.internal.jvmci.meta.DeoptimizationReason.TransferToInterpreter; +import static jdk.internal.jvmci.meta.DeoptimizationReason.UnreachedCode; +import static jdk.internal.jvmci.meta.DeoptimizationReason.Unresolved; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Deque; +import java.util.Formatter; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; + +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.InfopointReason; +import jdk.internal.jvmci.common.JVMCIError; import jdk.internal.jvmci.compiler.Compiler; - -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.meta.ConstantPool; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.LineNumberTable; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.RawConstant; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.StableOptionValue; + +import com.oracle.graal.bytecode.BytecodeLookupSwitch; +import com.oracle.graal.bytecode.BytecodeStream; +import com.oracle.graal.bytecode.BytecodeSwitch; +import com.oracle.graal.bytecode.BytecodeTableSwitch; +import com.oracle.graal.bytecode.Bytecodes; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.calc.FloatConvert; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; - -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; - -import com.oracle.graal.bytecode.*; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.debug.TTY; import com.oracle.graal.graph.Graph.Mark; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; import com.oracle.graal.graph.Node.ValueNumberable; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; import com.oracle.graal.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver; +import com.oracle.graal.graphbuilderconf.LoopExplosionPlugin; +import com.oracle.graal.graphbuilderconf.NodePlugin; import com.oracle.graal.java.BciBlockMapping.BciBlock; import com.oracle.graal.java.BciBlockMapping.ExceptionDispatchBlock; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.BeginStateSplitNode; +import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.DispatchBeginNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.EntryMarkerNode; +import com.oracle.graal.nodes.EntryProxyNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.KillingBeginNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNegationNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.SimpleInfopointNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.UnwindNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.AndNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.DivNode; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerDivNode; +import com.oracle.graal.nodes.calc.IntegerEqualsNode; +import com.oracle.graal.nodes.calc.IntegerLessThanNode; +import com.oracle.graal.nodes.calc.IntegerRemNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.calc.LeftShiftNode; +import com.oracle.graal.nodes.calc.MulNode; +import com.oracle.graal.nodes.calc.NarrowNode; +import com.oracle.graal.nodes.calc.NegateNode; +import com.oracle.graal.nodes.calc.NormalizeCompareNode; +import com.oracle.graal.nodes.calc.ObjectEqualsNode; +import com.oracle.graal.nodes.calc.OrNode; +import com.oracle.graal.nodes.calc.RemNode; +import com.oracle.graal.nodes.calc.RightShiftNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.SubNode; +import com.oracle.graal.nodes.calc.UnsignedRightShiftNode; +import com.oracle.graal.nodes.calc.XorNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.extended.BranchProbabilityNode; +import com.oracle.graal.nodes.extended.BytecodeExceptionNode; +import com.oracle.graal.nodes.extended.GuardedNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.IntegerSwitchNode; +import com.oracle.graal.nodes.java.ArrayLengthNode; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.nodes.java.ExceptionObjectNode; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.MonitorEnterNode; +import com.oracle.graal.nodes.java.MonitorExitNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.java.NewArrayNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.java.NewMultiArrayNode; +import com.oracle.graal.nodes.java.RegisterFinalizerNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.java.StoreIndexedNode; +import com.oracle.graal.nodes.java.TypeCheckNode; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.OptimisticOptimizations; /** * The {@code GraphBuilder} class parses the bytecode of a method and builds the IR graph.
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,20 @@ */ package com.oracle.graal.java; -import static com.oracle.graal.nodes.cfg.ControlFlowGraph.*; +import static com.oracle.graal.nodes.cfg.ControlFlowGraph.MIN_PROBABILITY; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; -import java.util.*; -import java.util.stream.*; - -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.graph.ReentrantNodeIterator; public final class ComputeLoopFrequenciesClosure extends ReentrantNodeIterator.NodeIteratorClosure<Double> {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.DerivedOptionValue.*; +import jdk.internal.jvmci.options.DerivedOptionValue; +import jdk.internal.jvmci.options.DerivedOptionValue.OptionSupplier; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.CompilerConfiguration; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.phases.tiers.SuitesProvider; public class DefaultSuitesProvider implements SuitesProvider {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,57 @@ */ package com.oracle.graal.java; -import static com.oracle.graal.bytecode.Bytecodes.*; -import static com.oracle.graal.graph.iterators.NodePredicates.*; -import static com.oracle.graal.java.BytecodeParser.Options.*; -import static com.oracle.graal.nodes.FrameState.*; -import static jdk.internal.jvmci.common.JVMCIError.*; +import static com.oracle.graal.bytecode.Bytecodes.DUP; +import static com.oracle.graal.bytecode.Bytecodes.DUP2; +import static com.oracle.graal.bytecode.Bytecodes.DUP2_X1; +import static com.oracle.graal.bytecode.Bytecodes.DUP2_X2; +import static com.oracle.graal.bytecode.Bytecodes.DUP_X1; +import static com.oracle.graal.bytecode.Bytecodes.DUP_X2; +import static com.oracle.graal.bytecode.Bytecodes.POP; +import static com.oracle.graal.bytecode.Bytecodes.POP2; +import static com.oracle.graal.bytecode.Bytecodes.SWAP; +import static com.oracle.graal.graph.iterators.NodePredicates.isA; +import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; +import static com.oracle.graal.java.BytecodeParser.Options.HideSubstitutionStates; +import static com.oracle.graal.nodes.FrameState.TWO_SLOT_MARKER; +import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.Function; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; import com.oracle.graal.graphbuilderconf.IntrinsicContext.SideEffectsState; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graphbuilderconf.ParameterPlugin; import com.oracle.graal.java.BciBlockMapping.BciBlock; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.util.GraphUtil; public final class FrameStateBuilder implements SideEffectsState {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.tiers.HighTierContext; /** * Parses the bytecodes of a method and builds the IR graph.
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/JsrNotSupportedBailout.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/JsrNotSupportedBailout.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; public class JsrNotSupportedBailout extends BailoutException {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/LargeLocalLiveness.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/LargeLocalLiveness.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.java; -import java.util.*; +import java.util.BitSet; import com.oracle.graal.java.BciBlockMapping.BciBlock;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/LocalLiveness.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/LocalLiveness.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,61 @@ */ package com.oracle.graal.java; -import static com.oracle.graal.bytecode.Bytecodes.*; -import com.oracle.graal.debug.*; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.ALOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.ASTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.DLOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.DSTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.FLOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.FSTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.IINC; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.ILOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.ISTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_0; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_1; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_2; +import static com.oracle.graal.bytecode.Bytecodes.LLOAD_3; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_0; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_1; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_2; +import static com.oracle.graal.bytecode.Bytecodes.LSTORE_3; +import static com.oracle.graal.bytecode.Bytecodes.RET; -import com.oracle.graal.bytecode.*; +import com.oracle.graal.bytecode.BytecodeStream; +import com.oracle.graal.debug.Debug; import com.oracle.graal.java.BciBlockMapping.BciBlock; /**
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/ConvertJTT.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/ConvertJTT.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,10 +24,14 @@ */ package com.oracle.graal.jtt; -import java.io.*; -import java.nio.charset.*; -import java.nio.file.*; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * Simple Utility to convert java tester tests from the proprietary test format into JUnit - tests.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.graal.jtt; -import static java.lang.reflect.Modifier.*; +import static java.lang.reflect.Modifier.isStatic; -import java.util.*; +import java.util.Collections; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; /**
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/ConstantPhiTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/ConstantPhiTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,18 @@ */ package com.oracle.graal.jtt.backend; -import static com.oracle.graal.api.directives.GraalDirectives.*; +import static com.oracle.graal.api.directives.GraalDirectives.LIKELY_PROBABILITY; +import static com.oracle.graal.api.directives.GraalDirectives.injectBranchProbability; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.OptionValue; import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.jtt.JTTTest; public class ConstantPhiTest extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/LargeConstantSectionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/LargeConstantSectionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,32 @@ */ package com.oracle.graal.jtt.backend; -import static jdk.internal.org.objectweb.asm.Opcodes.*; -import jdk.internal.jvmci.options.*; +import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; +import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; +import static jdk.internal.org.objectweb.asm.Opcodes.IFNE; +import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC; +import static jdk.internal.org.objectweb.asm.Opcodes.LADD; +import static jdk.internal.org.objectweb.asm.Opcodes.LCMP; +import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_0; +import static jdk.internal.org.objectweb.asm.Opcodes.LLOAD; +import static jdk.internal.org.objectweb.asm.Opcodes.LRETURN; +import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; +import jdk.internal.jvmci.options.OptionValue; import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import jdk.internal.org.objectweb.asm.*; +import jdk.internal.org.objectweb.asm.ClassWriter; +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 org.junit.*; +import org.junit.BeforeClass; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.jtt.JTTTest; public class LargeConstantSectionTest extends JTTTest { private static final String NAME = "LargeConstantSection";
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aaload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aaload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aaload_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aaload_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_0.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_aload_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_anewarray.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_anewarray.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_areturn.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_areturn.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_arraylength.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_arraylength.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_athrow.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_athrow.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_baload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_baload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_bastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_bastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_caload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_caload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_castore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_castore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_checkcast03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * Tests the checkcast works, when casting an array of interface.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2f.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2f.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2i01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2i01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2i02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2i02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2l01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2l01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2l02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2l02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2l03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_d2l03.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dadd.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dadd.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_daload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_daload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp06.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp07.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp07.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp08.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp08.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp09.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp09.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp10.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dcmp10.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ddiv.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ddiv.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dmul.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dmul.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dneg.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dneg.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dneg2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dneg2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_drem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_drem.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_drem extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dreturn.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dreturn.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dsub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dsub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dsub2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_dsub2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2d.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2d.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2i01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2i01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2i02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2i02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2l01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2l01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2l02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_f2l02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fadd.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fadd.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_faload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_faload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp06.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp07.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp07.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp08.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp08.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp09.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp09.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp10.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fcmp10.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fdiv.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fdiv.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fload.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fload_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fload_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fmul.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fmul.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fneg.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fneg.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_frem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_frem.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_frem extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_freturn.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_freturn.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fsub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_fsub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_b.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_b.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_b extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_c.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_c.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_c extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_d.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_d.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_d extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_f.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_f.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_f extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_i.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_i.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_i extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_l.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_l.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_l extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_o.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_o.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_o extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_s.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_s.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_s extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_z.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getfield_z.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield_z extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_b.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_b.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_c.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_c.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_d.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_d.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_f.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_f.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_i.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_i.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_l.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_l.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_s.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_s.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_z.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_getstatic_z.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2b.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2b.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2c.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2c.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2d.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2d.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2f.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2f.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2l.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2l.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2s.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_i2s.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const0.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iadd_const3.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iaload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iaload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iand.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iand.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iconst.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iconst.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_idiv.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_idiv.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_idiv2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_idiv2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifeq.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifeq.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifeq_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifeq_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifeq_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifeq_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifge.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifge.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifge_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifge_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifge_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifge_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifgt.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifgt.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmplt1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmplt1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmplt2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmplt2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmpne1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmpne1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmpne2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ificmpne2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifle.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifle.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iflt.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iflt.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifne.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifne.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnonnull.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnonnull.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnonnull_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnonnull_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnonnull_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnonnull_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnull.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnull.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnull_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnull_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnull_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ifnull_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iinc_4.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_0.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_0_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_0_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_0_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_0_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_1_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_1_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iload_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_imul.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_imul.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ineg.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ineg.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.jtt.bytecode; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.phases.*; -import com.oracle.graal.jtt.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.compiler.phases.HighTier; +import com.oracle.graal.jtt.JTTTest; +import com.oracle.graal.phases.tiers.Suites; /** * Tests the instanceof works, when casting an array of interface.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokeinterface.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokeinterface.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokespecial2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokestatic.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokestatic.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokevirtual.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_invokevirtual.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ior.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ior.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_irem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_irem.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_irem2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_irem2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_irem3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_irem3.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ireturn.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ireturn.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ishl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ishl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ishr.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ishr.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_isub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_isub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iushr.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_iushr.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ixor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ixor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2d.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2d.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2f.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2f.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2i.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2i.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_l2i extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2i_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_l2i_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ladd.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ladd.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ladd2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ladd2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_laload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_laload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_land.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_land.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lcmp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lcmp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_04.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_05.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldc_06.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldiv.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldiv.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldiv2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldiv2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldiv3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_ldiv3.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_0.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lload_3.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lmul.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lmul.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lneg.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lneg.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lookupswitch05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lrem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lrem.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lrem2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lrem2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lreturn.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lreturn.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lshl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lshl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lshr.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lshr.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lshr02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lshr02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lsub.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lsub.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lushr.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lushr.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lxor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lxor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_monitorenter02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_new.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_new.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_newarray.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_newarray.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putfield_04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putstatic.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_putstatic.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_saload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_saload.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_sastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_sastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch3.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_tableswitch4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_wide01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_wide01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_wide02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_wide02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.bytecode; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aaload0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aaload0.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_aaload0 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aaload1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aaload1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aastore0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aastore0.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_aastore0 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aastore1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_aastore1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_anewarray.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_anewarray.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_arraylength.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_arraylength.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_arraylength extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow0.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_athrow0 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow2.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_athrow2 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_athrow3.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_athrow3 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_baload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_baload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_baload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_bastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_bastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_bastore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_caload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_caload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_caload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_castore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_castore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_castore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast3.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast3.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast5.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast5.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast6.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_checkcast6.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_daload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_daload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_daload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_dastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_dastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_dastore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_faload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_faload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_faload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_fastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_fastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_fastore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_getfield1.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_getfield1 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_iaload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_iaload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_iaload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_iastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_iastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_iastore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_idiv.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_idiv.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_idiv extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_idiv2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_idiv2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_idiv2 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokespecial01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokespecial01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_invokevirtual02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_irem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_irem.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_irem extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_laload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_laload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_laload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_lastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_lastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_lastore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_ldiv.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_ldiv.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_ldiv extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_ldiv2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_ldiv2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_ldiv2 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_lrem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_lrem.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_lrem extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_monitorenter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_monitorenter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_multianewarray.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_multianewarray.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_newarray.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_newarray.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_putfield.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_putfield.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_putfield extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_saload.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_saload.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_saload extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_sastore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/BC_sastore.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BC_sastore extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Loop01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Loop01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Loop02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Loop02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Loop03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Loop03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NASE_1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NASE_1.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NASE_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NASE_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_00.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_00.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_06.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_07.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_07.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_08.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_08.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_09.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_09.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_10.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_10.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_11.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_NPE_11.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_StackOverflowError_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_StackOverflowError_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_StackOverflowError_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_StackOverflowError_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_StackOverflowError_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_StackOverflowError_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * Some basic checking of the stack trace produced after a StackOverflowError.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Two03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Catch_Unresolved03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Locals.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Locals.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Except_Locals extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Except_Synchronized02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized04.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Except_Synchronized04 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Except_Synchronized05.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Except_Synchronized05 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Finally02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_AIOOBE_00.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_AIOOBE_00.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_CCE_00.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_CCE_00.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_00.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_00.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/StackTrace_NPE_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InCatch01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InCatch01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_InCatch01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InCatch02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InCatch02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_InCatch02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InCatch03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InCatch03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_InCatch03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InNested.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_InNested.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_InNested extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_NPE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_NPE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_NPE_01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_Synchronized01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_Synchronized02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_Synchronized03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized04.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_Synchronized04 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/Throw_Synchronized05.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.except; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Throw_Synchronized05 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.jtt.except; -import jdk.internal.org.objectweb.asm.*; +import jdk.internal.org.objectweb.asm.ClassWriter; +import jdk.internal.org.objectweb.asm.MethodVisitor; +import jdk.internal.org.objectweb.asm.Opcodes; +import jdk.internal.org.objectweb.asm.Type; -import org.junit.*; +import org.junit.BeforeClass; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class UntrustedInterfaces extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_allocate04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_array04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_control01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_control01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_control02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_control02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_convert01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_convert01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_count.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_count.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Runs: 10 = 55; 20 = 210; 30 = 465; 40 = 820;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_dead01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_dead01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_demo01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_demo01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,11 +23,11 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Runs: 10 = 55; 20 = 210; 30 = 465; 40 = 820;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field03.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,11 +23,11 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field04.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_idea.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_idea.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ package com.oracle.graal.jtt.hotpath; -import java.util.*; +import java.util.Random; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class HP_idea extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_inline01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_inline01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_inline02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_inline02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_invoke01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_invoke01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_life.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_life.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,11 +23,11 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import java.util.*; +import java.util.Random; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_nest02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_scope01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_scope01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,10 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_scope02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_scope02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_series.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_series.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,10 @@ package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_trees01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_trees01.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6186134.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6186134.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.hotspot; -import java.util.*; +import java.util.ArrayList; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; // @formatter:off public class Test6186134 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6196102.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6196102.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotspot; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * @bug 6196102
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6753639.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6753639.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotspot; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * @test
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6823354.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6823354.java Wed Sep 16 21:17:42 2015 +0200 @@ -32,7 +32,7 @@ * @run main/othervm -Xcomp -XX:CompileOnly=Test6823354.lzcomp,Test6823354.tzcomp,.dolzcomp,.dotzcomp Test6823354 */ -import java.net.*; +import java.net.URLClassLoader; // Checkstyle: stop public class Test6823354 {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6850611.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6850611.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotspot; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; //@formatter:off
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6959129.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotspot/Test6959129.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.hotspot; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Test6959129 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/CharacterBits.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/CharacterBits.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class CharacterBits extends JTTTest { @SuppressWarnings("unused") private static char init = Character.reverseBytes((char) 42);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Class_getName.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Class_getName.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/DivideUnsigned.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/DivideUnsigned.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class DivideUnsigned extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.jdk; -import java.util.*; +import java.util.EnumMap; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/EnumMap02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.jdk; -import java.util.*; +import java.util.EnumMap; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/IntegerBits.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/IntegerBits.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class IntegerBits extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/LongBits.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/LongBits.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class LongBits extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/ShortBits.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/ShortBits.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class ShortBits extends JTTTest { @SuppressWarnings("unused") private static short init = Short.reverseBytes((short) 42);
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_currentTimeMillis01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_currentTimeMillis01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_currentTimeMillis02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_currentTimeMillis02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_nanoTime01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_nanoTime01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_nanoTime02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_nanoTime02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_setOut.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/System_setOut.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.jtt.jdk; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; -import org.junit.*; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Thread_setName.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Thread_setName.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/UnsafeAccess01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.jtt.jdk; -import java.lang.reflect.*; +import java.lang.reflect.Field; -import org.junit.*; +import org.junit.Test; -import sun.misc.*; +import sun.misc.Unsafe; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Unsafe_compareAndSwap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Unsafe_compareAndSwap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.jtt.jdk; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import sun.misc.*; +import sun.misc.Unsafe; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Unsafe_compareAndSwap extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.jdk; -import org.junit.*; +import org.junit.Test; -import sun.misc.*; +import sun.misc.Unsafe; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Unsafe_compareAndSwapNullCheck extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Boxed_TYPE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Boxed_TYPE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Bridge_method01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Bridge_method01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ClassLoader_loadClass01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ClassLoader_loadClass01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.lang; -import java.net.*; +import java.net.URL; +import java.net.URLClassLoader; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_Literal01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_Literal01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_Literal01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_asSubclass01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_asSubclass01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_asSubclass01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_cast01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_cast02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_cast02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_forName01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_forName02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.lang; -import java.net.*; +import java.net.URL; +import java.net.URLClassLoader; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_forName05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.lang; -import java.net.*; +import java.net.URL; +import java.net.URLClassLoader; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getComponentType01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getComponentType01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getComponentType01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getInterfaces01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getInterfaces01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.lang; -import java.io.*; +import java.io.Serializable; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getModifiers01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getModifiers02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getModifiers02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getName01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getName01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getName01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getName02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getName02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getName02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSimpleName01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSimpleName01.java Wed Sep 16 21:17:42 2015 +0200 @@ -27,9 +27,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getSimpleName01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSimpleName02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSimpleName02.java Wed Sep 16 21:17:42 2015 +0200 @@ -27,9 +27,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getSimpleName02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSuperClass01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_getSuperClass01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_getSuperClass01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isArray01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isArray01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isArray01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isAssignableFrom01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isAssignableFrom02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isAssignableFrom03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isAssignableFrom03 extends JTTTest implements Cloneable {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance04.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance04 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance05.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance05 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance06.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance06 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInstance07.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInstance07 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInterface01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isInterface01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isInterface01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isPrimitive01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Class_isPrimitive01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_isPrimitive01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Double_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Double_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Double_toString.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Double_toString.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Float_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Float_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Float_01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Float_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Float_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Float_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Float_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greater01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greater01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_greater01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greater02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greater02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_greater02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greater03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greater03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_greater03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greaterEqual01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greaterEqual01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_greaterEqual01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greaterEqual02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greaterEqual02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_greaterEqual02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greaterEqual03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_greaterEqual03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_greaterEqual03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_less01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_less01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_less01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_less02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_less02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_less02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_less03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_less03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_less03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_lessEqual01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_lessEqual01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_lessEqual01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_lessEqual02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_lessEqual02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_lessEqual02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_lessEqual03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Int_lessEqual03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Int_lessEqual03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/JDK_ClassLoaders01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/JDK_ClassLoaders01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/JDK_ClassLoaders02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/JDK_ClassLoaders02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.lang; -import java.net.*; +import java.net.URLClassLoader; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,20 @@ */ package com.oracle.graal.jtt.lang; -import java.util.*; -import java.util.function.*; +import java.util.EnumSet; +import java.util.function.IntBinaryOperator; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.StructuredGraph; public class LambdaEagerTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greater01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greater01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greater02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greater02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_greater02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greater03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greater03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_greater03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greaterEqual01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greaterEqual01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_greaterEqual01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greaterEqual02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greaterEqual02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_greaterEqual02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greaterEqual03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_greaterEqual03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_greaterEqual03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_less01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_less01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_less01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_less02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_less02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_less02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_less03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_less03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_less03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_lessEqual01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_lessEqual01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_lessEqual01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_lessEqual02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_lessEqual02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_lessEqual02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_lessEqual03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_lessEqual03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Long_lessEqual03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_reverseBytes01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_reverseBytes01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_reverseBytes02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Long_reverseBytes02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_abs.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_abs.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_cos.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_cos.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_exact.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_exact.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_log.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_log.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_log10.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_log10.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_pow.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_pow.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_sin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_sin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_sqrt.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_sqrt.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_tan.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Math_tan.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_clone01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_clone02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_clone02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_equals01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_equals01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_equals01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_getClass01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_getClass01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_hashCode01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_hashCode01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_hashCode01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_hashCode02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_hashCode02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,12 +24,12 @@ */ package com.oracle.graal.jtt.lang; -import java.time.*; -import java.util.*; +import java.time.DayOfWeek; +import java.util.HashMap; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_hashCode02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notify01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notify01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_notify01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notify02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notify02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_notify02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notifyAll01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notifyAll01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_notifyAll01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notifyAll02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_notifyAll02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_notifyAll02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_toString01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_toString02.java Wed Sep 16 21:17:42 2015 +0200 @@ -27,9 +27,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_toString02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_wait01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_wait01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_wait01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_wait02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_wait02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_wait02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_wait03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/Object_wait03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Object_wait03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ProcessEnvironment_init.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/ProcessEnvironment_init.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,13 @@ */ package com.oracle.graal.jtt.lang; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class ProcessEnvironment_init extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/StringCoding_Scale.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/StringCoding_Scale.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class StringCoding_Scale extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_intern03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_valueOf01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/String_valueOf01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/System_identityHashCode01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/System_identityHashCode01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.lang; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/DegeneratedLoop.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/DegeneratedLoop.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop06.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop07.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop07.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Loop07 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop07_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop07_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Loop07_2 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop08.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop08.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop09.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop09.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop09_2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop09_2.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop11.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop11.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop12.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop12.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop13.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop13.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop14.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop14.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop15.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop15.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Loop15 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop16.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop16.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests exiting 2 loops at the same time with escape-analysed values flowing out of loops
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop17.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/Loop17.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test around an object that escapes directly from inside a loop (no virtual phi on the loop)
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopEscape.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopEscape.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ // Checkstyle: stop package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test around an object that escapes directly from inside a loop (no virtual phi on the loop)
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopInline.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopInline.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class LoopInline extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopLastIndexOf.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopLastIndexOf.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * see java.lang.String.lastIndexOf(char[], int, int, char[], int ,int, int)
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopNewInstance.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopNewInstance.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.loop; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopParseLong.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopParseLong.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class LoopParseLong extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopPhi.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopPhi.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopPhiResolutionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopPhiResolutionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.jtt.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSpilling.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSpilling.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class LoopSpilling extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSwitch01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopSwitch01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopUnroll.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopUnroll.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.loop; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ArrayCompare01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ArrayCompare01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ArrayCompare02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ArrayCompare02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BC_invokevirtual2.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BC_invokevirtual2.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigByteParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigByteParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigDoubleParams02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigDoubleParams02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigFloatParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigFloatParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigFloatParams02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigFloatParams02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigIntParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigIntParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigIntParams02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigIntParams02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigInterfaceParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigInterfaceParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigLongParams02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigLongParams02.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams02.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams03.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams04.java Wed Sep 16 21:17:42 2015 +0200 @@ -25,9 +25,10 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * Tests different alignment on the stack with extended parameters (index > 5).
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigObjectParams02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigParamsAlignment.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigParamsAlignment.java Wed Sep 16 21:17:42 2015 +0200 @@ -27,9 +27,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class BigParamsAlignment extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigShortParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigShortParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigVirtualParams01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigVirtualParams01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Bubblesort.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Bubblesort.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Bubblesort extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ConstantLoadTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ConstantLoadTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class ConstantLoadTest extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Fibonacci.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Fibonacci.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/FloatingReads.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/FloatingReads.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class FloatingReads extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeInterface_04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeVirtual_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeVirtual_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class InvokeVirtual_01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeVirtual_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/InvokeVirtual_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class InvokeVirtual_02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Matrix01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/Matrix01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ReferenceMap01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/ReferenceMap01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/StrangeFrames.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/String_format01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/String_format01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/String_format02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/String_format02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_String01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_String01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_Unroll.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_Unroll.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_boolean01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_boolean01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_byte01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_byte01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_char01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_char01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_double01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_double01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_float01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_float01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_int01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_int01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_long01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_long01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_short01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/VarArgs_short01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.micro; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ABCE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ABCE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ABCE_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ABCE_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ABCE_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ABCE_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopy06.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopyGeneric.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayCopyGeneric.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests calls to the array copy method.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayLength01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ArrayLength01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of array length operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_idiv_16.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_idiv_16.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_idiv_4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_idiv_4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_imul_16.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_imul_16.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_imul_4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_imul_4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_ldiv_16.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_ldiv_16.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_ldiv_4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_ldiv_4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lmul_16.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lmul_16.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lmul_4.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lmul_4.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lshr_C16.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lshr_C16.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lshr_C24.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lshr_C24.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lshr_C32.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BC_lshr_C32.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BlockSkip01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/BlockSkip01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Cmov01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Cmov01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Cmov02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Cmov02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Conditional01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.optimize; -import java.util.*; +import java.util.Random; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.optimize; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class ConditionalElimination01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.jtt.optimize; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationReason; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class ConditionalElimination02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConvertCompare.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConvertCompare.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class ConvertCompare extends JTTTest { public static boolean test(int a, float d) {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/DeadCode01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/DeadCode01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/DeadCode02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/DeadCode02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Cast01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Cast01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of float conversions
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Convert04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of float conversions
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Double01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Double01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Double02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Double02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer comparisons.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Double03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Double03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Float01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Float01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Float02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Float02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer comparisons.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_InstanceOf01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_InstanceOf01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Int01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Int01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Int02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Int02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer comparisons.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Long01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Long01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Long02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Long02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer comparisons.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Math01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Fold_Math01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/InferStamp01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/InferStamp01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * test some stamps in combination with full loop unrolling and shifts.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Inline01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Inline01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Inline02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Inline02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/LLE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/LLE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test case for local load elimination. It makes sure that the second field store is not eliminated, because
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/List_reorder_bug.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/List_reorder_bug.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Logic0.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Logic0.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/LongToSomethingArray01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/LongToSomethingArray01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * inspired by java.security.SecureRandom.longToByteArray(long).
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test case for null check elimination.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test case for null check elimination.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test case for null check elimination.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Test case for null check elimination.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NCE_FlowSensitive05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.optimize; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_byte01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_byte01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_byte02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_byte02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_byte03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_byte03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_char01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_char01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_char02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_char02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_char03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_char03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_short01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_short01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_short02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_short02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_short03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Narrow_short03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NestedLoop_EA.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NestedLoop_EA.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,18 @@ */ package com.oracle.graal.jtt.optimize; -import java.util.*; +import java.util.ListIterator; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.jtt.JTTTest; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; public class NestedLoop_EA extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Phi01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Phi01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Phi02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Phi02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Phi03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Phi03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ReassociateConstants.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ReassociateConstants.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; public class ReassociateConstants {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Convert01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Convert01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization integer conversions.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Double01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Double01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of double operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Float01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Float01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Int04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_IntShift01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_IntShift01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_IntShift02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_IntShift02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_Long04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_LongShift01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_LongShift01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_LongShift02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Reduce_LongShift02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/SchedulingBug_01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/SchedulingBug_01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/SignExtendShort.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/SignExtendShort.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Switch01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Switch01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of switches.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Switch02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Switch02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.jtt.optimize; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of switches.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/TypeCastElem.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/TypeCastElem.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Cast02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Convert01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Convert01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization integer conversions.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Convert02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Convert02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization integer conversions.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Double01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Double01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Double02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Double02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Field02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests constant folding of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Float01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Float01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Float02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Float02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of float operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of instanceof operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of instanceof operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_InstanceOf03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of instanceof operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Int01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Int01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Int02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Int02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Int03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Int03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Long01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Long01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of long operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Long02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Long02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests optimization of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Long03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Long03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of long operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Loop01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/VN_Loop01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.optimize; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* * Tests value numbering of integer operations.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_get01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_get01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_get01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_get02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_get02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_get02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_get03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_get03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_get03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getBoolean01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getBoolean01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getBoolean01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getByte01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getByte01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getByte01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getChar01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getChar01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getChar01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getDouble01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getDouble01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getDouble01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getFloat01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getFloat01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getFloat01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getInt01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getInt01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getInt01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getLength01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getLength01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getLength01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getLong01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getLong01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getLong01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getShort01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_getShort01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_getShort01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_newInstance01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_newInstance02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_newInstance03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance04.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_newInstance04 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance05.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_newInstance05 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_newInstance06.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_newInstance06 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_set01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_set01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_set01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_set02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_set02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_set02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_set03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_set03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_set03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setBoolean01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setBoolean01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setBoolean01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setByte01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setByte01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setByte01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setChar01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setChar01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setChar01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setDouble01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setDouble01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setDouble01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setFloat01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setFloat01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setFloat01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setInt01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setInt01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setInt01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setLong01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setLong01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setLong01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setShort01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Array_setShort01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Array_setShort01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getDeclaredField01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getDeclaredField01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getDeclaredMethod01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getDeclaredMethod01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getField02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_getMethod02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_newInstance01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_newInstance02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Class_newInstance03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance06.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance06.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_newInstance06 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance07.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Class_newInstance07.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Class_newInstance07 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.Field; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_get04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_getType01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_getType01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Field_set03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_except01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.InvocationTargetException; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.InvocationTargetException; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_main03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_virtual01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Invoke_virtual01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.jtt.reflect; -import java.lang.reflect.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getParameterTypes01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getParameterTypes01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getReturnType01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/reflect/Method_getReturnType01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.reflect; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_contended01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Monitor_contended01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_notowner01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitor_notowner01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Monitor_notowner01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitorenter01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitorenter01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Monitorenter01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitorenter02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Monitorenter02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Monitorenter02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_wait01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_wait02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait03.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_wait03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Object_wait04.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Object_wait04 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/SynchronizedLoopExit01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/SynchronizedLoopExit01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /** * Inspired by {@code com.sun.media.sound.DirectAudioDevice$DirectDL.drain()}.
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal01.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal02.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/ThreadLocal03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_currentThread01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_currentThread01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_currentThread01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_getState01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_getState02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_getState02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_holdsLock01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_holdsLock01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_holdsLock01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isAlive01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isAlive01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_isAlive01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_isInterrupted01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted02.java Wed Sep 16 21:17:42 2015 +0200 @@ -26,9 +26,9 @@ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; //Test all, mainly monitors public class Thread_isInterrupted02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted03.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted04.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted04.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted05.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_isInterrupted05.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; /* */
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Thread_join01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join02.java Wed Sep 16 21:17:42 2015 +0200 @@ -27,9 +27,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Thread_join02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_join03.java Wed Sep 16 21:17:42 2015 +0200 @@ -27,9 +27,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Thread_join03 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_new01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_new02.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public class Thread_new02 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_setPriority01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_setPriority01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_setPriority01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_sleep01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_sleep01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_sleep01 extends JTTTest {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_yield01.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/threads/Thread_yield01.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,9 +24,9 @@ */ package com.oracle.graal.jtt.threads; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.jtt.*; +import com.oracle.graal.jtt.JTTTest; public final class Thread_yield01 extends JTTTest {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64AddressValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64AddressValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Address.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Address.Scale; +import com.oracle.graal.lir.CompositeValue; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public enum AMD64Arithmetic { FREM,
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArithmeticLIRGenerator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArithmeticLIRGenerator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; /** * This interface can be used to generate AMD64 LIR for arithmetic operations.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Binary.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Binary.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,33 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.differentRegisters; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.sameRegister; +import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMIOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.ImplicitNullCheck; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * AMD64 LIR instructions that have two inputs and one output.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BinaryConsumer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BinaryConsumer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,30 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MROp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.ImplicitNullCheck; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * AMD64 LIR instructions that have two input operands, but no output operand.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BlockEndOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BlockEndOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.amd64; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.StandardOp.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.StandardOp.AbstractBlockEndOp; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public abstract class AMD64BlockEndOp extends AbstractBlockEndOp {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BreakpointOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BreakpointOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Emits a breakpoint.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ByteSwapOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ByteSwapOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("BSWAP") public final class AMD64ByteSwapOp extends AMD64LIRInstruction {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64CCall.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64CCall.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public final class AMD64CCall extends AMD64LIRInstruction { public static final LIRInstructionClass<AMD64CCall> TYPE = LIRInstructionClass.create(AMD64CCall.class);
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,29 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.InvokeTarget; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class AMD64Call {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ClearRegisterOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ClearRegisterOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class AMD64ClearRegisterOp extends AMD64LIRInstruction { public static final LIRInstructionClass<AMD64ClearRegisterOp> TYPE = LIRInstructionClass.create(AMD64ClearRegisterOp.class);
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ControlFlow.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ControlFlow.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,39 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CompilationResult.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.CompilationResult.JumpTable; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Address.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Address.Scale; +import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.StandardOp; import com.oracle.graal.lir.StandardOp.BlockEndOp; +import com.oracle.graal.lir.SwitchStrategy; import com.oracle.graal.lir.SwitchStrategy.BaseSwitchClosure; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class AMD64ControlFlow {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.lir.framemap.FrameMap; /** * AMD64 specific frame map.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilderImpl; public class AMD64FrameMapBuilder extends FrameMapBuilderImpl {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64LIRInstruction.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64LIRInstruction.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.lir.amd64; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Convenience class to provide AMD64MacroAssembler for the {@link #emitCode} method.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MathIntrinsicOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MathIntrinsicOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; // @formatter:off public final class AMD64MathIntrinsicOp extends AMD64LIRInstruction {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,42 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static java.lang.Double.*; -import static java.lang.Float.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static java.lang.Double.doubleToRawLongBits; +import static java.lang.Float.floatToRawIntBits; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.amd64.*; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp; import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.LoadConstantOp; import com.oracle.graal.lir.StandardOp.NullCheck; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class AMD64Move {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MulDivOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MulDivOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,30 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.DIV; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.IDIV; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.IMUL; +import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp.MUL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * AMD64 mul/div operation. This operation has a single operand for the second input. The first
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64RestoreRegistersOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64RestoreRegistersOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.ValueUtil; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Restores registers from stack slots.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,26 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.Arrays; +import java.util.Set; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.ValueUtil; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * Saves registers to stack slots.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ShiftOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ShiftOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * AMD64 shift/rotate operation. This operation has a single operand for the first input and output.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SignExtendOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SignExtendOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; +import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("CDQ") public class AMD64SignExtendOp extends AMD64LIRInstruction {
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Unary.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Unary.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,27 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.asm.amd64.AMD64Assembler.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64Address; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MROp; +import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp; +import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.ImplicitNullCheck; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * AMD64 LIR instructions that have one input and one output.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ZapRegistersOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ZapRegistersOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,23 @@ */ package com.oracle.graal.lir.amd64; -import static com.oracle.graal.lir.amd64.AMD64SaveRegistersOp.*; +import static com.oracle.graal.lir.amd64.AMD64SaveRegistersOp.prune; -import java.util.*; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; -import com.oracle.graal.asm.amd64.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.amd64.AMD64MacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * Writes well known garbage values to registers.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/phases/StackMoveOptimizationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/phases/StackMoveOptimizationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,32 @@ */ package com.oracle.graal.lir.amd64.phases; -import static com.oracle.graal.lir.phases.LIRPhase.Options.*; +import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.NestedBooleanOptionValue; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.RedundantMoveElimination; import com.oracle.graal.lir.amd64.AMD64Move.AMD64MultiStackMove; import com.oracle.graal.lir.amd64.AMD64Move.AMD64StackMove; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; /** * Replaces sequential {@link AMD64StackMove}s of the same type with a single
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/ConstantStackCastTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/ConstantStackCastTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.lir.jtt; -import static com.oracle.graal.lir.LIRValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; /** * Tests move from a constant to a wider stack slot (e.g. byte constant to integer stack slot).
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,32 @@ */ package com.oracle.graal.lir.jtt; -import static com.oracle.graal.lir.LIRValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.stream.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.stream.Stream; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.jtt.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; +import com.oracle.graal.jtt.JTTTest; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Base class for LIR tests.
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestSpecification.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestSpecification.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.lir.jtt; -import java.util.*; +import java.util.HashMap; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public abstract class LIRTestSpecification { private Value result;
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.lir.jtt; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public class LIRTestTest extends LIRTest { private static final LIRTestSpecification stackCopy = new LIRTestSpecification() {
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/StackMoveTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/StackMoveTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.lir.jtt; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public class StackMoveTest extends LIRTest { private static class StackCopySpec extends LIRTestSpecification {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCAddressValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCAddressValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.lir.CompositeValue; public abstract class SPARCAddressValue extends CompositeValue {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,45 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CCR_V_SHIFT; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CCR_XCC_SHIFT; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.ANNUL; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL; +import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Fcc0; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Xcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Equal; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_Ordered; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fcmpd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fcmps; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.sparc.SPARC; -import com.oracle.graal.asm.*; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public enum SPARCArithmetic { // @formatter:off
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBitManipulationOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBitManipulationOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,25 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public final class SPARCBitManipulationOp extends SPARCLIRInstruction { public static final LIRInstructionClass<SPARCBitManipulationOp> TYPE = LIRInstructionClass.create(SPARCBitManipulationOp.class);
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBlockEndOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBlockEndOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.sparc; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; import com.oracle.graal.lir.StandardOp.AbstractBlockEndOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public abstract class SPARCBlockEndOp extends AbstractBlockEndOp implements SPARCLIRInstructionMixin { public static final LIRInstructionClass<SPARCBlockEndOp> TYPE = LIRInstructionClass.create(SPARCBlockEndOp.class);
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBreakpointOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBreakpointOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Emits a breakpoint.
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCByteSwapOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCByteSwapOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,26 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.asm.sparc.SPARCAssembler.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCAssembler.Asi; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.gen.LIRGeneratorTool; @Opcode("BSWAP") public final class SPARCByteSwapOp extends SPARCLIRInstruction implements SPARCTailDelayedLIRInstruction {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCCall.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCCall.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,27 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.sparc.SPARC.o7; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.InvokeTarget; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Sethix; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class SPARCCall {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCCompare.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCCompare.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,24 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Fcc0; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fcmpd; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fcmps; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; import com.oracle.graal.lir.sparc.SPARCControlFlow.CompareBranchOp; public enum SPARCCompare {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,37 +22,83 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.*; -import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static com.oracle.graal.lir.sparc.SPARCMove.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CBCOND; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm10; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm11; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm5; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.ANNUL; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL; +import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_NOT_TAKEN; +import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Icc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Xcc; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Always; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Equal; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_Equal; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_Greater; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_GreaterOrEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_Less; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_LessOrEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_UnorderedGreaterOrEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_UnorderedOrEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_UnorderedOrGreater; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_UnorderedOrLess; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.F_UnorderedOrLessOrEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Greater; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.GreaterEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.GreaterEqualUnsigned; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.GreaterUnsigned; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Less; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.LessEqual; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.LessEqualUnsigned; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.LessUnsigned; +import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.NotEqual; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.sparc.SPARCMove.const2reg; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.sparc.SPARC.g0; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.sparc.SPARC; import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Assembler.LabelHint; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict; import com.oracle.graal.asm.sparc.SPARCAssembler.CC; import com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.StandardOp; +import com.oracle.graal.lir.SwitchStrategy; import com.oracle.graal.lir.SwitchStrategy.BaseSwitchClosure; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class SPARCControlFlow { // This describes the maximum offset between the first emitted (load constant in to scratch,
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCDelayedControlTransfer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCDelayedControlTransfer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.sparc; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * This interface is used for {@link LIRInstruction}s which provide a delay slot for one instruction
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.sparc.SPARC; -import com.oracle.graal.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.lir.framemap.FrameMap; /** * SPARC specific frame map.
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilderImpl; public class SPARCFrameMapBuilder extends FrameMapBuilderImpl {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCImmediateAddressValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCImmediateAddressValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,22 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.lir.CompositeValue; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCIndexedAddressValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCIndexedAddressValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.lir.CompositeValue; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCJumpOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCJumpOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL; import com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.LabelRef; import com.oracle.graal.lir.StandardOp.JumpOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public final class SPARCJumpOp extends JumpOp implements SPARCDelayedControlTransfer, SPARCLIRInstructionMixin { public static final LIRInstructionClass<SPARCJumpOp> TYPE = LIRInstructionClass.create(SPARCJumpOp.class);
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLIRInstruction.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLIRInstruction.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.lir.sparc; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Convenience class to provide SPARCMacroAssembler for the {@link #emitCode} method.
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLoadConstantTableBaseOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLoadConstantTableBaseOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstructionClass; import com.oracle.graal.lir.StandardOp.NoOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Loads the constant section base into a register.
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMathIntrinsicOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMathIntrinsicOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public final class SPARCMathIntrinsicOp extends SPARCLIRInstruction implements SPARCTailDelayedLIRInstruction { public static final LIRInstructionClass<SPARCMathIntrinsicOp> TYPE = LIRInstructionClass.create(SPARCMathIntrinsicOp.class);
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,32 +22,60 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.asm.sparc.SPARCAssembler.*; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.MemoryBarriers.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.meta.JavaKind.*; -import static jdk.internal.jvmci.sparc.SPARC.*; +import static com.oracle.graal.asm.sparc.SPARCAssembler.MEMBAR_STORE_LOAD; +import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.MemoryBarriers.STORE_LOAD; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.meta.JavaKind.Byte; +import static jdk.internal.jvmci.meta.JavaKind.Char; +import static jdk.internal.jvmci.meta.JavaKind.Double; +import static jdk.internal.jvmci.meta.JavaKind.Float; +import static jdk.internal.jvmci.meta.JavaKind.Int; +import static jdk.internal.jvmci.meta.JavaKind.Long; +import static jdk.internal.jvmci.meta.JavaKind.Short; +import static jdk.internal.jvmci.sparc.SPARC.g0; -import java.util.*; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.sparc.SPARC; import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import com.oracle.graal.asm.sparc.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCAssembler; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Sethix; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.ImplicitNullCheck; import com.oracle.graal.lir.StandardOp.LoadConstantOp; import com.oracle.graal.lir.StandardOp.NullCheck; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class SPARCMove {
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,29 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.sparc.SPARCDelayedControlTransfer.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static com.oracle.graal.lir.sparc.SPARCDelayedControlTransfer.DUMMY; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.Arrays; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.sparc.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.ValueUtil; +import jdk.internal.jvmci.sparc.SPARC; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCAddress; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.Opcode; import com.oracle.graal.lir.StandardOp.SaveRegistersOp; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * Saves registers to stack slots.
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTailDelayedLIRInstruction.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTailDelayedLIRInstruction.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.sparc; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstruction; /** * Implementors of this interface are able to place its last instruction into the delay slot of a
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTestOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTestOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.lir.sparc; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.sparc.SPARC.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.sparc.SPARC.g0; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.sparc.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.asm.sparc.SPARCMacroAssembler; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; public class SPARCTestOp extends SPARCLIRInstruction { public static final LIRInstructionClass<SPARCTestOp> TYPE = LIRInstructionClass.create(SPARCTestOp.class);
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,26 @@ */ package com.oracle.graal.lir.test; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static org.junit.Assert.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; + +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.CompositeValue; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.LIRInstructionClass; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * This test verifies that {@link CompositeValue}s are immutable, i.e. that a write to a component
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/GenericValueMapTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/GenericValueMapTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.lir.test; -import static org.junit.Assert.*; -import jdk.internal.jvmci.code.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import jdk.internal.jvmci.code.Register; import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.util.GenericValueMap; public class GenericValueMapTest {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.lir; -import java.lang.annotation.*; -import java.util.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.EnumSet; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.lir; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.EnumSet; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.FieldIntrospection; +import com.oracle.graal.compiler.common.Fields; +import com.oracle.graal.compiler.common.FieldsScanner; import com.oracle.graal.lir.CompositeValue.Component; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRIntrospection.LIRFieldsScanner;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; /** * Represents an inlined {@link Constant} value.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.lir; -import static com.oracle.graal.lir.LIR.*; +import static com.oracle.graal.lir.LIR.verifyBlocks; -import java.util.*; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; /** * This class performs basic optimizations on the control flow graph after LIR generation.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.StandardOp.LoadConstantOp; import com.oracle.graal.lir.StandardOp.MoveOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; /** * This class optimizes moves, particularly those that result from eliminating SSA form.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FullInfopointOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FullInfopointOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.InfopointReason; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * Emits an infopoint (only mark the position).
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.List; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.BlockMap; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,27 @@ */ package com.oracle.graal.lir; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isConstantJavaValue; +import static jdk.internal.jvmci.code.ValueUtil.isIllegalJavaValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualObject; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.Arrays; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.DebugInfo; +import jdk.internal.jvmci.code.StackLockValue; +import jdk.internal.jvmci.code.VirtualObject; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.util.IndexedValueMap; /** * This class represents garbage collection and deoptimization information attached to a LIR
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInsertionBuffer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInsertionBuffer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * A buffer to enqueue updates to a list. This avoids frequent re-sizing of the list and copying of
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,32 @@ */ package com.oracle.graal.lir; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRInstruction.OperandMode.*; - -import java.lang.annotation.*; -import java.util.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; +import static com.oracle.graal.lir.LIRInstruction.OperandMode.ALIVE; +import static com.oracle.graal.lir.LIRInstruction.OperandMode.DEF; +import static com.oracle.graal.lir.LIRInstruction.OperandMode.TEMP; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.EnumMap; +import java.util.EnumSet; -import com.oracle.graal.lir.asm.*; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.Value; + +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * The base class for an {@code LIRInstruction}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.lir; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.Fields; +import com.oracle.graal.compiler.common.FieldsScanner; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,27 @@ */ package com.oracle.graal.lir; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -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.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.FieldIntrospection; +import com.oracle.graal.compiler.common.Fields; +import com.oracle.graal.compiler.common.FieldsScanner; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRValueUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRValueUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,9 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.Value; public final class LIRValueUtil {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,28 @@ */ package com.oracle.graal.lir; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; - -import java.util.*; +import static com.oracle.graal.lir.LIRValueUtil.asVariable; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import java.util.Arrays; +import java.util.BitSet; +import java.util.EnumSet; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; + +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.TTY; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.ssa.*; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.ssa.SSAUtil; public final class LIRVerifier {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LabelRef.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LabelRef.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.StandardOp.BranchOp; import com.oracle.graal.lir.StandardOp.JumpOp;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.StandardOp.ImplicitNullCheck; import com.oracle.graal.lir.StandardOp.NullCheck; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; public final class NullCheckOptimizer extends PostAllocationOptimizationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Opcode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Opcode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.lir; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Denotes an opcode name for an annotated {@link LIRInstruction}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,33 @@ */ package com.oracle.graal.lir; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.MoveOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; /** * Removes move instructions, where the destination value is already in place.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SimpleInfopointOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SimpleInfopointOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.code.DebugInfo; +import jdk.internal.jvmci.code.InfopointReason; -import com.oracle.graal.lir.asm.*; +import com.oracle.graal.lir.asm.CompilationResultBuilder; @Opcode("SIMPLE_INFOPOINT") public final class SimpleInfopointOp extends LIRInstruction {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,29 @@ */ package com.oracle.graal.lir; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; -import static com.oracle.graal.lir.LIRValueUtil.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.CONST; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import java.util.*; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.framemap.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.asm.CompilationResultBuilder; +import com.oracle.graal.lir.framemap.FrameMap; /** * A collection of machine-independent LIR operations, as well as interfaces to be implemented for
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SwitchStrategy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SwitchStrategy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.lir; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import java.util.Arrays; +import java.util.Comparator; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.lir.asm.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; + +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.Label; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.lir.asm.CompilationResultBuilder; /** * This class encapsulates different strategies on how to generate code for switch instructions.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Variable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Variable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,10 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; /** * Represents a value that is yet to be bound to a machine location (such as a {@link RegisterValue}
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/Interval.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/Interval.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,34 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.util.IntList; +import com.oracle.graal.compiler.common.util.Util; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.Variable; /** * Represents an interval in the {@linkplain LinearScan linear scan register allocator}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/IntervalWalker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/IntervalWalker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.alloc.lsra; -import com.oracle.graal.debug.*; - +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterBinding; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterBindingLists; import com.oracle.graal.lir.alloc.lsra.Interval.State;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,29 +22,51 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static com.oracle.graal.lir.phases.LIRPhase.Options.*; -import static jdk.internal.jvmci.code.CodeUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; +import static jdk.internal.jvmci.code.CodeUtil.isEven; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.Arrays; +import java.util.BitSet; +import java.util.EnumSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterAttributes; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.NestedBooleanOptionValue; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.Variable; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterBinding; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,38 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; +import com.oracle.graal.lir.StandardOp; import com.oracle.graal.lir.StandardOp.MoveOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; /** * Phase 7: Assign register numbers back to LIR.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,30 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.LoadConstantOp; import com.oracle.graal.lir.StandardOp.MoveOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; import com.oracle.graal.lir.alloc.lsra.Interval.SpillState; import com.oracle.graal.lir.alloc.lsra.LinearScan.IntervalPredicate; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; public class LinearScanEliminateSpillMovePhase extends AllocationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanIntervalDumper.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanIntervalDumper.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.lir.alloc.lsra.Interval.UsePosList; -import com.oracle.graal.lir.debug.*; +import com.oracle.graal.lir.debug.IntervalDumper; class LinearScanIntervalDumper implements IntervalDumper { private final Interval[] intervals;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,34 +22,52 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static com.oracle.graal.lir.debug.LIRGenerationDebugContext.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; +import static com.oracle.graal.lir.LIRValueUtil.asVariable; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static com.oracle.graal.lir.debug.LIRGenerationDebugContext.getSourceForOperandFromDebugContext; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.ArrayDeque; +import java.util.BitSet; +import java.util.Deque; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.alloc.ComputeBlockOrder; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.util.BitMap2D; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.LoadConstantOp; import com.oracle.graal.lir.StandardOp.StackStoreOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; +import com.oracle.graal.lir.ValueConsumer; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterPriority; import com.oracle.graal.lir.alloc.lsra.Interval.SpillState; import com.oracle.graal.lir.alloc.lsra.LinearScan.BlockData; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; public class LinearScanLifetimeAnalysisPhase extends AllocationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,28 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.commonDominator; +import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.dominates; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.Iterator; +import java.util.List; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.AllocatableValue; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.alloc.lsra.Interval.SpillState; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; public final class LinearScanOptimizeSpillPositionPhase extends AllocationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,20 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.BackendOptions.*; +import static com.oracle.graal.compiler.common.BackendOptions.LinearScanVariant; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.alloc.lsra.ssa.*; -import com.oracle.graal.lir.alloc.lsra.ssi.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.alloc.lsra.ssa.SSALinearScan; +import com.oracle.graal.lir.alloc.lsra.ssi.SSILinearScan; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; public final class LinearScanPhase extends AllocationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.lir.alloc.lsra; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; public final class LinearScanRegisterAllocationPhase extends AllocationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,22 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; -import java.util.*; +import java.util.BitSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.StandardOp; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; /** * Phase 6: resolve data flow
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,26 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.CodeUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.CodeUtil.isOdd; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig.AllocatableRegisters; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.util.Util; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.ValueMoveOp; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterBinding; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterPriority;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,26 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; /** */
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.Indent; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterBinding; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterBindingLists; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterPriority;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OutOfRegistersException.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OutOfRegistersException.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.alloc.lsra; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; public class OutOfRegistersException extends BailoutException {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/RegisterVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/RegisterVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,24 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; + +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.util.ArrayMap; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinarScanResolveDataFlowPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinarScanResolveDataFlowPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,24 @@ */ package com.oracle.graal.lir.alloc.lsra.ssa; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.asConstant; +import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.List; + +import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.ssa.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.alloc.lsra.Interval; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanResolveDataFlowPhase; +import com.oracle.graal.lir.alloc.lsra.MoveResolver; +import com.oracle.graal.lir.ssa.SSAUtil; import com.oracle.graal.lir.ssa.SSAUtil.PhiValueVisitor; class SSALinarScanResolveDataFlowPhase extends LinearScanResolveDataFlowPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScan.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScan.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.lir.alloc.lsra.ssa; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; +import com.oracle.graal.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; +import com.oracle.graal.lir.alloc.lsra.LinearScanResolveDataFlowPhase; +import com.oracle.graal.lir.alloc.lsra.MoveResolver; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.ssa.*; +import com.oracle.graal.lir.ssa.SSAUtil; public final class SSALinearScan extends LinearScan {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.lir.alloc.lsra.ssa; -import static com.oracle.graal.compiler.common.BackendOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.BackendOptions.LinearScanVariant; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import com.oracle.graal.debug.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.BackendOptions.LSRAVariant; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.LabelOp; import com.oracle.graal.lir.StandardOp.MoveOp; -import com.oracle.graal.lir.alloc.lsra.*; +import com.oracle.graal.lir.alloc.lsra.Interval; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; public class SSALinearScanEliminateSpillMovePhase extends LinearScanEliminateSpillMovePhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,22 @@ */ package com.oracle.graal.lir.alloc.lsra.ssa; -import java.util.*; - -import com.oracle.graal.debug.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.LabelOp; -import com.oracle.graal.lir.alloc.lsra.*; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.alloc.lsra.Interval; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterPriority; -import com.oracle.graal.lir.ssa.*; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; +import com.oracle.graal.lir.ssa.SSAUtil; public class SSALinearScanLifetimeAnalysisPhase extends LinearScanLifetimeAnalysisPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,28 @@ */ package com.oracle.graal.lir.alloc.lsra.ssa; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.alloc.lsra.Interval; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.MoveResolver; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; public final class SSAMoveResolver extends MoveResolver {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScan.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScan.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.graal.lir.alloc.lsra.ssi; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.alloc.lsra.ssa.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; +import com.oracle.graal.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; +import com.oracle.graal.lir.alloc.lsra.LinearScanResolveDataFlowPhase; +import com.oracle.graal.lir.alloc.lsra.MoveResolver; +import com.oracle.graal.lir.alloc.lsra.ssa.SSAMoveResolver; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.ssi.*; +import com.oracle.graal.lir.ssi.SSIVerifier; public final class SSILinearScan extends LinearScan {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanEliminateSpillMovePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanEliminateSpillMovePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.lir.alloc.lsra.ssi; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.StandardOp.MoveOp; -import com.oracle.graal.lir.alloc.lsra.*; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; public class SSILinearScanEliminateSpillMovePhase extends LinearScanEliminateSpillMovePhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanLifetimeAnalysisPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanLifetimeAnalysisPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,25 @@ */ package com.oracle.graal.lir.alloc.lsra.ssi; -import static com.oracle.graal.lir.alloc.lsra.ssa.SSALinearScanLifetimeAnalysisPhase.*; +import static com.oracle.graal.lir.alloc.lsra.ssa.SSALinearScanLifetimeAnalysisPhase.setHint; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.LabelOp; -import com.oracle.graal.lir.alloc.lsra.*; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.alloc.lsra.Interval; import com.oracle.graal.lir.alloc.lsra.Interval.RegisterPriority; import com.oracle.graal.lir.alloc.lsra.Interval.SpillState; -import com.oracle.graal.lir.ssi.*; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; +import com.oracle.graal.lir.ssi.SSIUtil; public class SSILinearScanLifetimeAnalysisPhase extends LinearScanLifetimeAnalysisPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanResolveDataFlowPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanResolveDataFlowPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,28 @@ */ package com.oracle.graal.lir.alloc.lsra.ssi; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.asConstant; +import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.HashMap; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.alloc.lsra.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.alloc.lsra.Interval; +import com.oracle.graal.lir.alloc.lsra.LinearScan; +import com.oracle.graal.lir.alloc.lsra.LinearScanResolveDataFlowPhase; +import com.oracle.graal.lir.alloc.lsra.MoveResolver; import com.oracle.graal.lir.ssa.SSAUtil.PhiValueVisitor; -import com.oracle.graal.lir.ssi.*; +import com.oracle.graal.lir.ssi.SSIUtil; public class SSILinearScanResolveDataFlowPhase extends LinearScanResolveDataFlowPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/FixedInterval.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/FixedInterval.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRInstruction; /** * Represents a fixed interval.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/IntervalHint.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/IntervalHint.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.alloc.trace; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; /** * An interval that is a hint for an {@code TraceInterval interval}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/RegisterVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/RegisterVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,24 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; + +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.util.ArrayMap; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/ShadowedRegisterValue.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/ShadowedRegisterValue.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.lir.alloc.trace; -import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; +import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlotValue; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.CompositeValue; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolver.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolver.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,41 @@ */ package com.oracle.graal.lir.alloc.trace; -import static com.oracle.graal.lir.alloc.trace.TraceUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.alloc.trace.TraceUtil.asShadowedRegisterValue; +import static com.oracle.graal.lir.alloc.trace.TraceUtil.isShadowedRegisterValue; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; /**
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceInterval.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceInterval.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,33 @@ */ package com.oracle.graal.lir.alloc.trace; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.RegisterValue; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.util.Util; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.Variable; /** * Represents an interval in the {@linkplain TraceLinearScan linear scan register allocator}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalDumper.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalDumper.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.debug.*; +import com.oracle.graal.lir.debug.IntervalDumper; final class TraceIntervalDumper implements IntervalDumper { private final FixedInterval[] fixedIntervals;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalWalker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalWalker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.lir.alloc.trace; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; import com.oracle.graal.lir.alloc.trace.FixedInterval.FixedList; import com.oracle.graal.lir.alloc.trace.TraceInterval.AnyList; import com.oracle.graal.lir.alloc.trace.TraceInterval.RegisterBinding;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,31 @@ */ package com.oracle.graal.lir.alloc.trace; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.CodeUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.CodeUtil.isOdd; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig.AllocatableRegisters; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.util.Util; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.alloc.lsra.*; +import com.oracle.graal.lir.alloc.lsra.OutOfRegistersException; import com.oracle.graal.lir.alloc.trace.TraceInterval.RegisterPriority; import com.oracle.graal.lir.alloc.trace.TraceInterval.SpillState; import com.oracle.graal.lir.alloc.trace.TraceInterval.State;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLocalMoveResolver.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLocalMoveResolver.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,37 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; /** */
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.alloc.trace; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; class TraceUtil {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/UsePosList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/UsePosList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.alloc.trace; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.lir.alloc.trace.TraceInterval.*; +import com.oracle.graal.compiler.common.util.IntList; +import com.oracle.graal.lir.alloc.trace.TraceInterval.RegisterPriority; /** * List of use positions. Each entry in the list records the use position and register priority
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,49 @@ */ package com.oracle.graal.lir.asm; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.function.Consumer; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.AbstractAddress; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; import jdk.internal.jvmci.code.CompilationResult.ConstantReference; import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; import jdk.internal.jvmci.code.DataSection.Data; import jdk.internal.jvmci.code.DataSection.DataBuilder; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.DebugInfo; +import jdk.internal.jvmci.code.InfopointReason; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.InvokeTarget; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.VMConstant; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.asm.NumUtil; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.framemap.FrameMap; /** * Fills in a {@link CompilationResult} as its code is being assembled.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilderFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilderFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.lir.asm; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.lir.framemap.*; +import com.oracle.graal.asm.Assembler; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.lir.framemap.FrameMap; /** * Factory class for creating {@link CompilationResultBuilder}s.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,45 @@ */ package com.oracle.graal.lir.constopt; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static com.oracle.graal.lir.phases.LIRPhase.Options.*; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Collections; +import java.util.Deque; +import java.util.EnumSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.NestedBooleanOptionValue; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.LoadConstantOp; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.Variable; import com.oracle.graal.lir.constopt.ConstantTree.Flags; import com.oracle.graal.lir.constopt.ConstantTree.NodeCost; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase; /** * This optimization tries to improve the handling of constants by replacing a single definition of
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTree.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTree.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,17 @@ */ package com.oracle.graal.lir.constopt; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.function.BiConsumer; +import java.util.function.Predicate; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.compiler.common.cfg.PrintableDominatorOptimizationProblem; +import com.oracle.graal.compiler.common.cfg.PropertyConsumable; /** * Represents a dominator (sub-)tree for a constant definition.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.lir.constopt; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Deque; +import java.util.HashSet; +import java.util.List; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.Indent; import com.oracle.graal.lir.constopt.ConstantTree.Flags; import com.oracle.graal.lir.constopt.ConstantTree.NodeCost;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.lir.constopt; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.LoadConstantOp; +import com.oracle.graal.lir.Variable; /** * Represents def-use tree of a constant.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.lir.constopt; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.ValueProcedure; /** * Represents a usage of a constant.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/VariableMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/VariableMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.lir.constopt; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.function.Consumer; +import java.util.function.Predicate; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.Variable; /** * Maps variables to a generic type.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/debug/LIRGenerationDebugContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/debug/LIRGenerationDebugContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.debug; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.lir.LIR; /** * Provides information about {@link LIR} generation for debugging purposes.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarker.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarker.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,30 @@ */ package com.oracle.graal.lir.dfa; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import java.util.*; - -import jdk.internal.jvmci.code.*; +import java.util.EnumSet; +import java.util.List; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionStateProcedure; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.util.ValueSet; public abstract class LocationMarker<T extends AbstractBlockBase<T>, S extends ValueSet<S>> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarkerPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarkerPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,28 @@ */ package com.oracle.graal.lir.dfa; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import java.util.List; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterAttributes; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; + +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.ReferenceMapBuilder; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; /** * Mark all live references for a frame state. The frame state use this information to build the OOP
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/MarkBasePointersPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/MarkBasePointersPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,23 @@ */ package com.oracle.graal.lir.dfa; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.lir.phases.AllocationPhase; +import com.oracle.graal.lir.util.IndexedValueMap; +import com.oracle.graal.lir.util.ValueSet; /** * Record all derived reference base pointers in a frame state.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,25 @@ */ package com.oracle.graal.lir.dfa; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.LIRInstruction.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.lir.LIRInstruction.OperandFlag; +import com.oracle.graal.lir.LIRInstruction.OperandMode; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.ReferenceMapBuilder; +import com.oracle.graal.lir.util.IndexedValueMap; +import com.oracle.graal.lir.util.ValueSet; final class RegStackValueSet extends ValueSet<RegStackValueSet> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/UniqueWorkList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/UniqueWorkList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.lir.dfa; -import java.util.*; +import java.util.ArrayDeque; +import java.util.BitSet; +import java.util.Collection; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; /** * Ensures that an element is only in the worklist once.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,22 @@ */ package com.oracle.graal.lir.framemap; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.asm.*; +import com.oracle.graal.asm.NumUtil; /** * This class is used to build the stack frame layout for a compiled method. A {@link StackSlot} is
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.lir.framemap; -import java.util.*; +import java.util.BitSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.LIRKind; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.stackslotalloc.*; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.stackslotalloc.StackSlotAllocator; /** * A {@link FrameMapBuilder} is used to collect all information necessary to
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,32 @@ */ package com.oracle.graal.lir.framemap; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.EnumSet; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.RegisterConfig; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.stackslotalloc.*; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.stackslotalloc.StackSlotAllocator; /** * A FrameMapBuilder that records allocation.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.framemap; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.VirtualStackSlot; /** * A {@link FrameMapBuilder} that allows access to the underlying {@link FrameMap}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/ReferenceMapBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/ReferenceMapBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.framemap; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.ReferenceMap; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRFrameState; public abstract class ReferenceMapBuilder {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleVirtualStackSlot.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleVirtualStackSlot.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.framemap; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.LIRKind; /** * Represents a {@link VirtualStackSlot virtual stack slot} for a specific {@link LIRKind kind}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/VirtualStackSlotRange.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/VirtualStackSlotRange.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.lir.framemap; -import java.util.*; +import java.util.BitSet; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.LIRKind; /** * Represents a {@link #getSlots() numbered} range of {@link VirtualStackSlot virtual stack slot} of
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/ArithmeticLIRGenerator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/ArithmeticLIRGenerator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.calc.FloatConvert; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.lir.LIRFrameState; /** * This interface can be used to generate LIR for arithmetic operations.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BenchmarkCounterFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BenchmarkCounterFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRInstruction; public interface BenchmarkCounterFactory { LIRInstruction createBenchmarkCounter(String name, String group, Value increment);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BlockValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BlockValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; public interface BlockValueMap {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/DefaultLIRKindTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/DefaultLIRKindTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.lir.gen; -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.LIRKind; +import jdk.internal.jvmci.meta.PlatformKind; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.LIRKindTool; /** * Default implementation of {@link LIRKindTool}. Returns the normal Java kind for primitive types.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.lir.gen; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.stackslotalloc.*; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.stackslotalloc.StackSlotAllocator; public interface LIRGenerationResult {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.lir.gen; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.stackslotalloc.*; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.framemap.FrameMap; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.stackslotalloc.StackSlotAllocator; public class LIRGenerationResultBase implements LIRGenerationResult { private final LIR lir;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,55 @@ */ package com.oracle.graal.lir.gen; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.asConstant; +import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.asAllocatableValue; +import static jdk.internal.jvmci.code.ValueUtil.isAllocatableValue; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterAttributes; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.asm.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.asm.Label; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.spi.CodeGenProviders; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.compiler.common.spi.LIRKindTool; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRVerifier; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.StandardOp; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp; +import com.oracle.graal.lir.SwitchStrategy; +import com.oracle.graal.lir.Variable; /** * This class traverses the HIR instructions and generates LIR instructions from them.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,32 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterAttributes; +import jdk.internal.jvmci.code.StackSlotValue; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.PlatformKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.spi.CodeGenProviders; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LabelRef; +import com.oracle.graal.lir.SwitchStrategy; +import com.oracle.graal.lir.Variable; public interface LIRGeneratorTool extends ArithmeticLIRGenerator, BenchmarkCounterFactory {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/PhiResolver.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/PhiResolver.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.lir.gen; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import static jdk.internal.jvmci.meta.Value.*; - -import java.util.*; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.internal.jvmci.meta.Value.ILLEGAL; -import jdk.internal.jvmci.meta.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Value; + +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; /**
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.lir.gen; -import static com.oracle.graal.lir.LIRValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import java.util.*; +import java.util.EnumSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.LoadConstantOp;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.lir.phases; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; public abstract class AllocationPhase extends LIRPhase<AllocationPhase.AllocationContext> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationStage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationStage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.lir.phases; -import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.*; +import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.TraceRA; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.alloc.trace.*; -import com.oracle.graal.lir.dfa.*; +import com.oracle.graal.lir.alloc.lsra.LinearScanPhase; +import com.oracle.graal.lir.alloc.trace.TraceRegisterAllocationPhase; +import com.oracle.graal.lir.dfa.LocationMarkerPhase; +import com.oracle.graal.lir.dfa.MarkBasePointersPhase; import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; -import com.oracle.graal.lir.stackslotalloc.*; +import com.oracle.graal.lir.stackslotalloc.LSStackSlotAllocator; +import com.oracle.graal.lir.stackslotalloc.SimpleStackSlotAllocator; public class AllocationStage extends LIRPhaseSuite<AllocationContext> { public AllocationStage() {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/EconomyAllocationStage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/EconomyAllocationStage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.phases; -import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.dfa.*; +import com.oracle.graal.lir.alloc.lsra.LinearScanPhase; +import com.oracle.graal.lir.dfa.LocationMarkerPhase; import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; -import com.oracle.graal.lir.stackslotalloc.*; +import com.oracle.graal.lir.stackslotalloc.SimpleStackSlotAllocator; public class EconomyAllocationStage extends LIRPhaseSuite<AllocationContext> { public EconomyAllocationStage() {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.lir.phases; -import java.util.*; -import java.util.regex.*; +import java.util.List; +import java.util.regex.Pattern; + +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import jdk.internal.jvmci.options.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugMemUseTracker; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.gen.LIRGenerationResult; /** * Base class for all {@link LIR low-level} phases. Subclasses should be stateless. There will be
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhaseSuite.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhaseSuite.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.lir.phases; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.gen.LIRGenerationResult; public class LIRPhaseSuite<C> extends LIRPhase<C> { private final List<LIRPhase<C>> phases;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.lir.phases; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.AllocationPhase.*; -import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.*; -import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.code.*; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.Variable; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; public class LIRSuites {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.lir.phases; -import java.util.*; +import java.util.List; + +import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; public abstract class PostAllocationOptimizationPhase extends LIRPhase<PostAllocationOptimizationPhase.PostAllocationOptimizationContext> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationStage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationStage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.lir.phases; -import static com.oracle.graal.lir.phases.LIRPhase.Options.*; -import jdk.internal.jvmci.options.*; +import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; +import jdk.internal.jvmci.options.NestedBooleanOptionValue; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.ControlFlowOptimizer; +import com.oracle.graal.lir.EdgeMoveOptimizer; +import com.oracle.graal.lir.NullCheckOptimizer; +import com.oracle.graal.lir.RedundantMoveElimination; import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import com.oracle.graal.lir.profiling.*; +import com.oracle.graal.lir.profiling.MoveProfiling; public class PostAllocationOptimizationStage extends LIRPhaseSuite<PostAllocationOptimizationContext> { public static class Options {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PreAllocationOptimizationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PreAllocationOptimizationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.lir.phases; -import java.util.*; +import java.util.List; + +import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; public abstract class PreAllocationOptimizationPhase extends LIRPhase<PreAllocationOptimizationPhase.PreAllocationOptimizationContext> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PreAllocationOptimizationStage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PreAllocationOptimizationStage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.lir.phases; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.compiler.common.BackendOptions.*; +import static com.oracle.graal.compiler.common.BackendOptions.EnableSSIConstruction; +import static com.oracle.graal.compiler.common.GraalOptions.SSA_LIR; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.lir.constopt.*; +import com.oracle.graal.compiler.common.BackendOptions; +import com.oracle.graal.lir.constopt.ConstantLoadOptimization; import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import com.oracle.graal.lir.ssa.*; -import com.oracle.graal.lir.ssi.*; +import com.oracle.graal.lir.ssa.SSADestructionPhase; +import com.oracle.graal.lir.ssi.SSIConstructionPhase; public class PreAllocationOptimizationStage extends LIRPhaseSuite<PreAllocationOptimizationContext> { public PreAllocationOptimizationStage() {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/profiling/MoveProfiling.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/profiling/MoveProfiling.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,33 @@ */ package com.oracle.graal.lir.profiling; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp; import com.oracle.graal.lir.StandardOp.LoadConstantOp; import com.oracle.graal.lir.StandardOp.MoveOp; import com.oracle.graal.lir.StandardOp.ValueMoveOp; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.gen.BenchmarkCounterFactory; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase; public class MoveProfiling extends PostAllocationOptimizationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSADestructionPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSADestructionPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.lir.ssa; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInsertionBuffer; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.gen.PhiResolver; +import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase; public final class SSADestructionPhase extends PreAllocationOptimizationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.lir.ssa; -import java.util.*; +import java.util.List; + +import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.JumpOp; import com.oracle.graal.lir.StandardOp.LabelOp; +import com.oracle.graal.lir.ValueConsumer; /** * Utilities for working with Static-Single-Assignment LIR form.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,17 +23,23 @@ package com.oracle.graal.lir.ssa; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import java.util.*; +import java.util.BitSet; +import java.util.EnumSet; +import java.util.HashMap; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.lir.*; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,30 @@ */ package com.oracle.graal.lir.ssi; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.CompositeValue; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.StandardOp.LabelOp; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.lir.gen.BlockValueMap; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.util.ValueMap; +import com.oracle.graal.lir.util.VariableVirtualStackValueMap; public final class SSIBlockValueMapImpl implements BlockValueMap {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIConstructionPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIConstructionPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,26 @@ */ package com.oracle.graal.lir.ssi; -import java.util.*; +import java.util.ArrayDeque; +import java.util.BitSet; +import java.util.Deque; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.ssa.*; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.framemap.FrameMapBuilder; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase; +import com.oracle.graal.lir.ssa.SSAUtil; public final class SSIConstructionPhase extends PreAllocationOptimizationPhase {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.lir.ssi; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.BlockEndOp; -import com.oracle.graal.lir.LIRInstruction.*; -import com.oracle.graal.lir.StandardOp.*; -import com.oracle.graal.lir.ssa.SSAUtil.*; +import com.oracle.graal.lir.StandardOp.LabelOp; +import com.oracle.graal.lir.ValueConsumer; +import com.oracle.graal.lir.ssa.SSAUtil.PhiValueVisitor; /** * Utilities for working with Static-Single-Information LIR form.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.lir.ssi; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; +import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; import com.oracle.graal.lir.StandardOp.BlockEndOp;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/FixPointIntervalBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/FixPointIntervalBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,28 @@ */ package com.oracle.graal.lir.stackslotalloc; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; +import java.util.ArrayDeque; +import java.util.BitSet; +import java.util.Deque; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,47 @@ */ package com.oracle.graal.lir.stackslotalloc; -import static com.oracle.graal.lir.phases.LIRPhase.Options.*; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import java.util.*; -import java.util.function.*; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Deque; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.List; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.function.Consumer; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; +import jdk.internal.jvmci.options.NestedBooleanOptionValue; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.ValueProcedure; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; +import com.oracle.graal.lir.framemap.SimpleVirtualStackSlot; +import com.oracle.graal.lir.framemap.VirtualStackSlotRange; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; /** * Linear Scan {@link StackSlotAllocator}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,29 @@ */ package com.oracle.graal.lir.stackslotalloc; -import static jdk.internal.jvmci.code.ValueUtil.*; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; + +import java.util.List; -import java.util.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import com.oracle.graal.compiler.common.alloc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.Indent; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.ValueProcedure; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; +import com.oracle.graal.lir.framemap.SimpleVirtualStackSlot; +import com.oracle.graal.lir.framemap.VirtualStackSlotRange; +import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.SpillMoveFactory; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.AllocationPhase; public class SimpleStackSlotAllocator extends AllocationPhase implements StackSlotAllocator {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.lir.stackslotalloc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.LIRKind; public final class StackInterval {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackIntervalDumper.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackIntervalDumper.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.stackslotalloc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.debug.*; +import com.oracle.graal.lir.debug.IntervalDumper; class StackIntervalDumper implements IntervalDumper { private final StackInterval[] intervals;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackSlotAllocator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackSlotAllocator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.lir.stackslotalloc; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.StackSlot; +import jdk.internal.jvmci.code.VirtualStackSlot; -import com.oracle.graal.lir.framemap.*; -import com.oracle.graal.lir.gen.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.lir.framemap.FrameMapBuilderTool; +import com.oracle.graal.lir.gen.LIRGenerationResult; /** * A {@link StackSlotAllocator} is responsible for translating {@link VirtualStackSlot virtual}
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/GenericValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/GenericValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.lir.util; -import java.util.*; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.CollectionsFactory; public final class GenericValueMap<T> extends ValueMap<Value, T> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.lir.util; -import java.util.*; +import java.util.EnumSet; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.lir.*; +import com.oracle.graal.lir.InstructionValueConsumer; +import com.oracle.graal.lir.InstructionValueProcedure; +import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.util; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; /** * A map interface to map {@link Value}s to other objects.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueSet.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueSet.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.util; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; public abstract class ValueSet<S extends ValueSet<S>> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/VariableVirtualStackValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/VariableVirtualStackValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.lir.util; -import static com.oracle.graal.lir.LIRValueUtil.*; -import static jdk.internal.jvmci.code.ValueUtil.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.lir.LIRValueUtil.asVariable; +import static com.oracle.graal.lir.LIRValueUtil.isVariable; +import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; +import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Value; public class VariableVirtualStackValueMap<K extends Value, T> extends ValueMap<K, T> {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/BasicInductionVariable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/BasicInductionVariable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,22 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.loop.MathUtil.*; -import jdk.internal.jvmci.common.*; +import static com.oracle.graal.loop.MathUtil.add; +import static com.oracle.graal.loop.MathUtil.mul; +import static com.oracle.graal.loop.MathUtil.sub; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.calc.IntegerConvertNode; +import com.oracle.graal.nodes.calc.NegateNode; +import com.oracle.graal.nodes.calc.SubNode; public class BasicInductionVariable extends InductionVariable {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/CountedLoopInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/CountedLoopInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,26 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.loop.MathUtil.*; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.loop.MathUtil.add; +import static com.oracle.graal.loop.MathUtil.divBefore; +import static com.oracle.graal.loop.MathUtil.sub; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.loop.InductionVariable.Direction; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.IntegerLessThanNode; +import com.oracle.graal.nodes.extended.GuardingNode; public class CountedLoopInfo {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedConvertedInductionVariable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedConvertedInductionVariable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.loop; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IntegerConvertNode; public class DerivedConvertedInductionVariable extends DerivedInductionVariable {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedInductionVariable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedInductionVariable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.loop; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; /** * Base class of the derived induction variables.
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.loop.MathUtil.*; -import jdk.internal.jvmci.common.*; +import static com.oracle.graal.loop.MathUtil.add; +import static com.oracle.graal.loop.MathUtil.sub; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.calc.IntegerConvertNode; +import com.oracle.graal.nodes.calc.NegateNode; +import com.oracle.graal.nodes.calc.SubNode; public class DerivedOffsetInductionVariable extends DerivedInductionVariable {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedScaledInductionVariable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedScaledInductionVariable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.loop.MathUtil.*; +import static com.oracle.graal.loop.MathUtil.mul; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IntegerConvertNode; +import com.oracle.graal.nodes.calc.NegateNode; +import com.oracle.graal.nodes.util.GraphUtil; public class DerivedScaledInductionVariable extends DerivedInductionVariable {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/InductionVariable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/InductionVariable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.loop; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; /** * This class describes a value node that is an induction variable in a counted loop.
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,56 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.graph.Node.*; +import static com.oracle.graal.graph.Node.newIdentityMap; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Map; +import java.util.Queue; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.iterators.NodePredicate; import com.oracle.graal.loop.InductionVariable.Direction; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.InfopointNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerEqualsNode; +import com.oracle.graal.nodes.calc.IntegerLessThanNode; +import com.oracle.graal.nodes.calc.LeftShiftNode; +import com.oracle.graal.nodes.calc.MulNode; +import com.oracle.graal.nodes.calc.NegateNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.SubNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.util.GraphUtil; public class LoopEx {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,38 @@ */ package com.oracle.graal.loop; -import java.util.*; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Graph.DuplicationReplacement; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.GuardPhiNode; +import com.oracle.graal.nodes.GuardProxyNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.VirtualState; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.java.MonitorEnterNode; +import com.oracle.graal.nodes.spi.NodeWithState; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; public abstract class LoopFragment {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInside.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInside.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,37 @@ */ package com.oracle.graal.loop; -import java.util.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.graph.Graph.DuplicationReplacement; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.GuardPhiNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; import com.oracle.graal.nodes.VirtualState.NodeClosure; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.nodes.memory.MemoryPhiNode; +import com.oracle.graal.nodes.util.GraphUtil; public class LoopFragmentInside extends LoopFragment {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInsideBefore.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInsideBefore.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.loop; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.FixedNode; public class LoopFragmentInsideBefore extends LoopFragmentInside {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInsideFrom.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInsideFrom.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.loop; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.FixedNode; public class LoopFragmentInsideFrom extends LoopFragmentInside {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentWhole.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentWhole.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,16 @@ */ package com.oracle.graal.loop; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Graph.DuplicationReplacement; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.cfg.Block; public class LoopFragmentWhole extends LoopFragment {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopPolicies.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopPolicies.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,28 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.LoopMaxUnswitch; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumDesiredSize; +import static com.oracle.graal.compiler.common.GraalOptions.MinimumPeelProbability; -import java.util.*; +import java.util.List; + +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.options.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.VirtualState; import com.oracle.graal.nodes.VirtualState.VirtualClosure; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.debug.*; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.debug.ControlFlowAnchorNode; public abstract class LoopPolicies { @Option(help = "", type = OptionType.Expert) public static final OptionValue<Integer> LoopUnswitchMaxIncrease = new OptionValue<>(500);
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,27 @@ */ package com.oracle.graal.loop; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumDesiredSize; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; import com.oracle.graal.graph.Graph.Mark; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.Position; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.SwitchNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public abstract class LoopTransformations {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopsData.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopsData.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,24 @@ */ package com.oracle.graal.loop; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; public class LoopsData {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/MathUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/MathUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.loop; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.calc.IntegerDivNode; /** * Utility methods to perform integer math with some obvious constant folding first.
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopFullUnrollPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopFullUnrollPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.loop.phases; -import com.oracle.graal.debug.*; - -import com.oracle.graal.loop.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopPolicies; +import com.oracle.graal.loop.LoopTransformations; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class LoopFullUnrollPhase extends BasePhase<PhaseContext> {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopPeelingPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopPeelingPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.loop.phases; -import com.oracle.graal.debug.*; - -import com.oracle.graal.loop.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopPolicies; +import com.oracle.graal.loop.LoopTransformations; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.Phase; public class LoopPeelingPhase extends Phase {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopSafepointEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopSafepointEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.loop.phases; -import com.oracle.graal.loop.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.tiers.MidTierContext; public class LoopSafepointEliminationPhase extends BasePhase<MidTierContext> {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopUnswitchingPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopUnswitchingPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.loop.phases; -import java.util.*; - -import com.oracle.graal.debug.*; +import java.util.List; -import com.oracle.graal.graph.*; -import com.oracle.graal.loop.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopPolicies; +import com.oracle.graal.loop.LoopTransformations; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.Phase; public class LoopUnswitchingPhase extends Phase {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/ReassociateInvariantPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/ReassociateInvariantPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.loop.phases; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import com.oracle.graal.loop.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.Phase; public class ReassociateInvariantPhase extends Phase {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/ArrayDuplicationBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/ArrayDuplicationBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,15 @@ */ package com.oracle.graal.microbenchmarks.graal; -import java.util.*; +import java.util.Arrays; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.OperationsPerInvocation; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; @State(Scope.Thread) public class ArrayDuplicationBenchmark {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.microbenchmarks.graal; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Warmup; -import com.oracle.graal.microbenchmarks.graal.util.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.microbenchmarks.graal.util.GraalState; +import com.oracle.graal.microbenchmarks.graal.util.GraphState; +import com.oracle.graal.microbenchmarks.graal.util.MethodSpec; +import com.oracle.graal.phases.common.ConditionalEliminationPhase; public class ConditionalEliminationBenchmark extends GraalBenchmark {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.microbenchmarks.graal; -import java.util.*; +import java.util.StringTokenizer; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Warmup; -import com.oracle.graal.microbenchmarks.graal.util.*; +import com.oracle.graal.microbenchmarks.graal.util.FrameStateAssignmentState; +import com.oracle.graal.microbenchmarks.graal.util.MethodSpec; @Warmup(iterations = 15) public class FrameStateAssigmentPhaseBenchmark extends GraalBenchmark {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/GraalBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/GraalBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,13 @@ */ package com.oracle.graal.microbenchmarks.graal; -import static com.oracle.graal.microbenchmarks.graal.GraalBenchmark.Defaults.*; +import static com.oracle.graal.microbenchmarks.graal.GraalBenchmark.Defaults.FORKS; +import static com.oracle.graal.microbenchmarks.graal.GraalBenchmark.Defaults.MEASUREMENT_ITERATIONS; +import static com.oracle.graal.microbenchmarks.graal.GraalBenchmark.Defaults.WARMUP_ITERATIONS; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Warmup; /** * All classes defining Graal benchmarks must subclass this class as it defines the default value
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/GraphCopyBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/GraphCopyBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.microbenchmarks.graal; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Warmup; -import com.oracle.graal.graph.*; -import com.oracle.graal.microbenchmarks.graal.util.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.microbenchmarks.graal.util.GraalState; +import com.oracle.graal.microbenchmarks.graal.util.GraphState; +import com.oracle.graal.microbenchmarks.graal.util.MethodSpec; +import com.oracle.graal.nodes.StructuredGraph; /** * Benchmarks the performance of {@link Graph#copy()}.
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/NodeBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/NodeBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.microbenchmarks.graal; -import java.util.*; +import java.util.HashMap; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.infra.Blackhole; -import com.oracle.graal.graph.*; -import com.oracle.graal.microbenchmarks.graal.util.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.microbenchmarks.graal.util.MethodSpec; +import com.oracle.graal.microbenchmarks.graal.util.NodesState; import com.oracle.graal.microbenchmarks.graal.util.NodesState.NodePair; public class NodeBenchmark extends GraalBenchmark {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.microbenchmarks.graal; -import java.util.*; +import java.util.Arrays; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Warmup; -import com.oracle.graal.microbenchmarks.graal.util.*; +import com.oracle.graal.microbenchmarks.graal.util.MethodSpec; +import com.oracle.graal.microbenchmarks.graal.util.ScheduleState; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; @Warmup(iterations = 15)
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.common.FrameStateAssignmentPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; public class FrameStateAssignmentState extends GraphState {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.runtime.RuntimeProvider; /** * Read-only, benchmark-wide state providing Graal runtime context.
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Method; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.HighTierContext; public class GraalUtil {
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraphState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraphState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.getGraph; +import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.internal.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugEnvironment; +import com.oracle.graal.debug.internal.DebugScope; +import com.oracle.graal.nodes.StructuredGraph; /** * State providing a new copy of a graph for each invocation of a benchmark. Subclasses of this
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/MethodSpec.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/MethodSpec.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Annotation for specifying a method based on a declaring class, a name and parameter types.
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/NodesState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/NodesState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,19 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.*; +import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.getGraphFromMethodSpec; +import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.getNodes; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; /** * State providing the nodes in a graph. Subclasses of this class are annotated with
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/ScheduleState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/ScheduleState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; public class ScheduleState extends GraphState {
--- a/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/ElementException.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/ElementException.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodeinfo.processor; -import javax.lang.model.element.*; +import javax.lang.model.element.Element; /** * Denotes an error encountered while processing an element.
--- a/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeProcessor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeProcessor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,30 @@ */ package com.oracle.graal.nodeinfo.processor; -import static java.util.Collections.*; +import static java.util.Collections.reverse; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; -import java.io.*; -import java.util.*; -import java.util.stream.*; - -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; -import javax.lang.model.util.*; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.FilerException; +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedSourceVersion; +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.TypeElement; +import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.nodeinfo.NodeInfo; @SupportedSourceVersion(SourceVersion.RELEASE_8) @SupportedAnnotationTypes({"com.oracle.graal.nodeinfo.NodeInfo"})
--- a/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,28 @@ */ package com.oracle.graal.nodeinfo.processor; -import static javax.lang.model.element.Modifier.*; +import static javax.lang.model.element.Modifier.FINAL; +import static javax.lang.model.element.Modifier.PRIVATE; +import static javax.lang.model.element.Modifier.PROTECTED; +import static javax.lang.model.element.Modifier.PUBLIC; +import static javax.lang.model.element.Modifier.STATIC; +import static javax.lang.model.element.Modifier.TRANSIENT; -import java.util.*; +import java.util.List; +import java.util.Set; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; +import javax.lang.model.util.Elements; +import javax.lang.model.util.Types; /** * Verifies static constraints on nodes.
--- a/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/NodeInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/NodeInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.nodeinfo; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
--- a/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/StructuralInput.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/StructuralInput.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,11 @@ */ package com.oracle.graal.nodeinfo; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Marker type for describing node inputs in snippets that are not of type {@link InputType#Value}.
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/AbstractObjectStampTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/AbstractObjectStampTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.test.GraalCompilerTest; public abstract class AbstractObjectStampTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; /**
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/LoopPhiCanonicalizerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/LoopPhiCanonicalizerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.nodes.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.iterators.NodePredicate; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class LoopPhiCanonicalizerTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/NegateNodeCanonicalizationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/NegateNodeCanonicalizationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import jdk.internal.jvmci.meta.JavaConstant; -import org.junit.*; +import org.junit.Before; +import org.junit.Test; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; /**
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; + +import org.junit.Assert; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.nodes.type.StampTool; public class ObjectStampJoinTest extends AbstractObjectStampTest {
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampMeetTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampMeetTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; public class ObjectStampMeetTest extends AbstractObjectStampTest {
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TrustedInterface; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; public class ObjectStampTest extends AbstractObjectStampTest { @Test
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,23 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Iterator; +import java.util.NoSuchElementException; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.AnchoringNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(allowedUsageTypes = {InputType.Guard, InputType.Anchor}) public abstract class AbstractBeginNode extends FixedWithNextNode implements LIRLowerable, Simplifiable, GuardingNode, AnchoringNode, IterableNodeType {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; /** * This node represents an unconditional explicit request for immediate deoptimization.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Arrays; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public abstract class AbstractEndNode extends FixedNode implements IterableNodeType, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo public abstract class AbstractFixedGuardNode extends DeoptimizingFixedWithNextNode implements Simplifiable, GuardingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractLocalNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractLocalNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.calc.FloatingNode; @NodeInfo public abstract class AbstractLocalNode extends FloatingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMergeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMergeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.nodes; -import static com.oracle.graal.graph.iterators.NodePredicates.*; +import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; -import java.util.*; - -import com.oracle.graal.debug.*; +import java.util.List; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * Denotes the merging of multiple control-flow paths.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractStateSplit.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractStateSplit.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; /** * Provides an implementation of {@link StateSplit}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public final class BeginNode extends AbstractBeginNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; /** * Base class for {@link AbstractBeginNode}s that are associated with a frame state.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public abstract class BinaryOpLogicNode extends LogicNode implements LIRLowerable, Canonicalizable.Binary<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * A node that results in a platform dependent breakpoint instruction being emitted. A number of
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(allowedUsageTypes = {InputType.Extension}) public abstract class CallTargetNode extends ValueNode implements LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CanonicalizableLocation.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CanonicalizableLocation.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodes.memory.address.AddressNode; public interface CanonicalizableLocation { ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo(nameTemplate = "ConditionAnchor(!={p#negated})", allowedUsageTypes = {InputType.Guard}) public final class ConditionAnchorNode extends FixedWithNextNode implements Canonicalizable.Unary<Node>, Lowerable, GuardingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,35 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Map; -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.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.VMConstant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.IllegalStamp; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.lir.ConstantValue; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * The {@code ConstantNode} represents a {@link Constant constant}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public abstract class ControlSinkNode extends FixedNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; /** * The {@code ControlSplitNode} is a base class for all instructions that split the control flow
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,21 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +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.MetaAccessProvider; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.debug.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(shortName = "Deopt", nameTemplate = "Deopt {p#reason/s}") public final class DeoptimizeNode extends AbstractDeoptimizeNode implements Lowerable, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public abstract class DeoptimizingFixedWithNextNode extends FixedWithNextNode implements DeoptimizingNode.DeoptBefore {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.spi.NodeWithState; /** * Interface implemented by nodes which may need {@linkplain FrameState deoptimization information}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public class DirectCallTargetNode extends LoweredCallTargetNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DispatchBeginNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DispatchBeginNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; /** * The entry node of an exception dispatcher block.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class DynamicDeoptimizeNode extends AbstractDeoptimizeNode implements LIRLowerable, Lowerable, Canonicalizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EncodedGraph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EncodedGraph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Set; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.NodeClass; /** * A {@link StructuredGraph} encoded in a compact binary representation as a byte[] array. See
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EndNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EndNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo(allowedUsageTypes = {InputType.Association}, nameTemplate = "End") public final class EndNode extends AbstractEndNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * This node will be inserted at point specified by {@link StructuredGraph#getEntryBCI()}, usually
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryProxyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryProxyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.ValueProxy; /** * Proxy node that is used in OSR. This node drops the stamp information from the value, since the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo(nameTemplate = "FixedGuard(!={p#negated}) {p#reason/s}", allowedUsageTypes = {InputType.Guard}) public final class FixedGuardNode extends AbstractFixedGuardNode implements Lowerable, IterableNodeType {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public abstract class FixedNode extends ValueNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedWithNextNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; /** * Base class of all nodes that are fixed within the control flow graph and have an immediate
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.AnchoringNode; @NodeInfo public abstract class FloatingAnchoredNode extends FloatingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingGuardedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingGuardedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.GuardedNode; +import com.oracle.graal.nodes.extended.GuardingNode; @NodeInfo public abstract class FloatingGuardedNode extends FloatingNode implements GuardedNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,35 @@ */ package com.oracle.graal.nodes; -import static jdk.internal.jvmci.code.BytecodeFrame.*; - -import java.util.*; +import static jdk.internal.jvmci.code.BytecodeFrame.getPlaceholderBciName; +import static jdk.internal.jvmci.code.BytecodeFrame.isPlaceholderBci; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.bytecode.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.bytecode.Bytecodes; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.virtual.EscapeObjectState; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code FrameState} class encapsulates the frame state (i.e. local variables and operand
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.InfopointReason; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.NodeWithState; /** * Nodes of this type are inserted into the graph to denote points of interest to debugging.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphDecoder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphDecoder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,34 @@ */ package com.oracle.graal.nodes; -import static jdk.internal.jvmci.common.JVMCIError.*; +import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Deque; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.Fields; +import com.oracle.graal.compiler.common.util.TypeReader; +import com.oracle.graal.compiler.common.util.UnsafeArrayTypeReader; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Edges; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.NodeList; +import com.oracle.graal.graph.NodeSuccessorList; /** * Decoder for {@link EncodedGraph encoded graphs} produced by {@link GraphEncoder}. Support for
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,29 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.Iterator; +import java.util.Map; +import java.util.Objects; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.Architecture; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; +import com.oracle.graal.compiler.common.Fields; +import com.oracle.graal.compiler.common.util.FrequencyEncoder; +import com.oracle.graal.compiler.common.util.TypeConversion; +import com.oracle.graal.compiler.common.util.TypeReader; +import com.oracle.graal.compiler.common.util.TypeWriter; +import com.oracle.graal.compiler.common.util.UnsafeArrayTypeWriter; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Edges; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeList; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graph.iterators.NodeIterable; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.java.ExceptionObjectNode; /** * Encodes a {@link StructuredGraph} to a compact byte[] array. All nodes of the graph and edges
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,20 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.extended.AnchoringNode; +import com.oracle.graal.nodes.extended.GuardingNode; /** * A guard is a node that deoptimizes based on a conditional expression. Guards are not attached to
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.GuardingNode; /** * Guard {@link PhiNode}s merge guard dependencies at control flow merges.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardProxyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardProxyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.Proxy; @NodeInfo(allowedUsageTypes = {InputType.Guard}, nameTemplate = "Proxy({i#value})") public final class GuardProxyNode extends ProxyNode implements GuardingNode, Proxy, LIRLowerable, Canonicalizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,22 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * A node that changes the type of its input, usually narrowing it. For example, a GuardedValueNode
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,47 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.JavaTypeProfile.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerLessThanNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * The {@code IfNode} represents a branch that can go one of two directions depending on the outcome
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public class IndirectCallTargetNode extends LoweredCallTargetNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.InfopointReason; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public abstract class InfopointNode extends FixedWithNextNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.nodes.extended.GuardedNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.UncheckedInterfaceProvider; +import com.oracle.graal.nodes.type.StampTool; public interface Invoke extends StateSplit, Lowerable, DeoptimizingNode.DeoptDuring, GuardedNode, UncheckedInterfaceProvider {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,26 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * The {@code InvokeNode} represents all kinds of method calls.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(nameTemplate = "Invoke!#{p#targetMethod/s}", allowedUsageTypes = {InputType.Memory}) public final class InvokeWithExceptionNode extends ControlSplitNode implements Invoke, MemoryCheckpoint.Single, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; @NodeInfo(allowedUsageTypes = {InputType.Memory}) public final class KillingBeginNode extends AbstractBeginNode implements MemoryCheckpoint.Single {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * The {@code LogicConstantNode} represents a boolean constant.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; /** * Logic node that negates its argument.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes; -import static com.oracle.graal.nodeinfo.InputType.*; +import static com.oracle.graal.nodeinfo.InputType.Condition; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; @NodeInfo(allowedUsageTypes = {Condition}) public abstract class LogicNode extends FloatingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,24 @@ */ package com.oracle.graal.nodes; -import static com.oracle.graal.graph.iterators.NodePredicates.*; +import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; -import java.util.*; +import java.util.Set; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.graph.iterators.NodePredicate; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo public final class LoopBeginNode extends AbstractMergeNode implements IterableNodeType, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Collections; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * LoopEnd nodes represent a loop back-edge. When a LoopEnd is reached, execution continues at the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopExitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopExitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo(allowedUsageTypes = {InputType.Association}) public final class LoopExitNode extends BeginStateSplitNode implements IterableNodeType {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public abstract class LoweredCallTargetNode extends CallTargetNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; /** * Denotes the merging of multiple control-flow paths.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/NamedLocationIdentity.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/NamedLocationIdentity.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.EnumMap; +import java.util.HashSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; import jdk.internal.jvmci.meta.JavaKind.FormatWithToString; +import jdk.internal.jvmci.meta.LocationIdentity; /** * A {@link LocationIdentity} with a name.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.UncheckedInterfaceProvider; /** * The {@code Parameter} instruction is a placeholder for an incoming argument to a function call.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Iterator; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.calc.FloatingNode; /** * {@code PhiNode}s represent the merging of edges at a control flow merges (
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.java.ArrayLengthNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.util.GraphUtil; /** * A {@link PiNode} that also provides an array length in addition to a more refined stamp. A usage
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,16 +24,25 @@ //JaCoCo Exclude -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * A node that changes the type of its input, usually narrowing it. For example, a {@link PiNode}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ProxyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ProxyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.IterableNodeType; import com.oracle.graal.graph.Node.ValueNumberable; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.GuardingNode; /** * A proxy is inserted at loop exits for any value that is created inside the loop (i.e. was not
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Marks a position in the graph where a safepoint should be emitted.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; @NodeInfo public final class ShortCircuitOrNode extends LogicNode implements IterableNodeType, Canonicalizable.Binary<LogicNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.code.InfopointReason; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class SimpleInfopointNode extends InfopointNode implements LIRLowerable, IterableNodeType, Simplifiable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimplifyingGraphDecoder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimplifyingGraphDecoder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodes.extended.IntegerSwitchNode; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.util.GraphUtil; /** * Graph decoder that simplifies nodes during decoding. The standard
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; /** * The start node of a graph.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StateSplit.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StateSplit.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.spi.NodeWithState; /** * A state split is a node that may have a frame state associated with it.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,29 @@ */ package com.oracle.graal.nodes; -import java.util.*; -import java.util.concurrent.atomic.*; -import java.util.function.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; import jdk.internal.jvmci.compiler.Compiler; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Assumptions; import jdk.internal.jvmci.meta.Assumptions.Assumption; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.SpeculationLog; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.debug.JavaMethodContext; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.util.GraphUtil; /** * A graph that contains at least one distinguished node : the {@link #start() start} node. This
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeCheckHints.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeCheckHints.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; -import jdk.internal.jvmci.meta.JavaTypeProfile.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; +import jdk.internal.jvmci.meta.ResolvedJavaType; /** * Utility for deriving hint types for a type check instruction (e.g. checkcast or instanceof) based
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public abstract class UnaryOpLogicNode extends LogicNode implements LIRLowerable, Canonicalizable.Unary<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Unwinds the current frame to an exception handler in the caller frame.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodePredicate; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; /** * This class represents a value within the graph, including local variables, phis, and all other
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.nodes; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import java.util.ArrayList; +import java.util.Collection; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.memory.*; +import jdk.internal.jvmci.meta.JavaKind; + +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.memory.MemoryNode; public class ValueNodeUtil {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * Value {@link PhiNode}s merge data flow values at control flow merges.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; @NodeInfo(nameTemplate = "Proxy({i#value})") public final class ValueProxyNode extends ProxyNode implements Canonicalizable, Virtualizable, ValueProxy {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/VirtualState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/VirtualState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,10 @@ */ package com.oracle.graal.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; /** * Base class for nodes that contain "virtual" state, like FrameState and VirtualObjectState.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AbsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AbsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.UnaryOp.Abs; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * Absolute value.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AddNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AddNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Add; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "+") public class AddNode extends BinaryArithmeticNode<Add> implements NarrowableArithmeticNode, BinaryCommutative<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,25 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.And; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "&") public final class AndNode extends BinaryArithmeticNode<And> implements NarrowableArithmeticNode, BinaryCommutative<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryArithmeticNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryArithmeticNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,27 @@ */ package com.oracle.graal.nodes.calc; -import java.io.*; -import java.util.function.*; +import java.io.Serializable; +import java.util.function.Function; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodePredicate; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo public abstract class BinaryArithmeticNode<OP> extends BinaryNode implements ArithmeticLIRLowerable, Canonicalizable.Binary<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; /** * The {@code BinaryNode} class is the base of arithmetic and logic operations with two inputs.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,24 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.BinaryOpLogicNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNegationNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; /* TODO (thomaswue/gdub) For high-level optimization purpose the compare node should be a boolean *value* (it is currently only a helper node) * But in the back-end the comparison should not always be materialized (for example in x86 the comparison result will not be in a register but in a flag)
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,24 @@ */ package com.oracle.graal.nodes.calc; -import static com.oracle.graal.nodes.calc.CompareNode.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.nodes.calc.CompareNode.createCompareNode; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNegationNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * The {@code ConditionalNode} class represents a comparison that yields one of two values. Note
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.nodes.ArithmeticOperation; +import com.oracle.graal.nodes.ValueNode; /** * Represents a conversion between primitive types.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/DivNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/DivNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Div; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "/") public final class DivNode extends BinaryArithmeticNode<Div> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FixedBinaryNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FixedBinaryNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingFixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public abstract class FixedBinaryNode extends DeoptimizingFixedWithNextNode implements Canonicalizable.Binary<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,23 @@ */ package com.oracle.graal.nodes.calc; -import java.util.*; +import java.util.EnumMap; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.calc.FloatConvert; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.FloatConvertOp; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * A {@code FloatConvert} converts between integers and floating point numbers according to Java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "==") public final class FloatEqualsNode extends CompareNode implements BinaryCommutative<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "<") public final class FloatLessThanNode extends CompareNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public abstract class FloatingNode extends ValueNode implements Node.ValueNumberable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNegationNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "|<|") public final class IntegerBelowNode extends CompareNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,23 @@ */ package com.oracle.graal.nodes.calc; -import java.io.*; -import java.util.function.*; +import java.io.Serializable; +import java.util.function.Function; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; /** * An {@code IntegerConvert} converts an integer to an integer of different width.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeUtil; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(shortName = "/") public class IntegerDivNode extends FixedBinaryNode implements Lowerable, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,28 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNegationNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "==") public final class IntegerEqualsNode extends CompareNode implements BinaryCommutative<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,25 @@ */ package com.oracle.graal.nodes.calc; -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.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "<") public final class IntegerLessThanNode extends CompareNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeUtil; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(shortName = "%") public class IntegerRemNode extends FixedBinaryNode implements Lowerable, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.BinaryOpLogicNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.ValueNode; /** * This node will perform a "test" operation on its arguments. Its result is equivalent to the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,25 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.UnaryOpLogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.PiPushable; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; /** * An IsNullNode will be true if the supplied value is null, and false if it is non-null.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp.Shl; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "<<") public final class LeftShiftNode extends ShiftNode<Shl> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/MulNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/MulNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,23 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Mul; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "*") public class MulNode extends BinaryArithmeticNode<Mul> implements NarrowableArithmeticNode, BinaryCommutative<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * The {@code NarrowNode} converts an integer to a narrower integer.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.UnaryOp.Neg; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * The {@code NegateNode} node negates its operand.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Returns -1, 0, or 1 if either x < y, x == y, or x > y. If the comparison is undecided (one
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.UnaryOp.Not; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * Binary negation of long or integer values.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,30 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.GetClassNode; +import com.oracle.graal.nodes.java.TypeCheckNode; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; @NodeInfo(shortName = "==") public final class ObjectEqualsNode extends PointerEqualsNode implements Virtualizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,24 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Or; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "|") public final class OrNode extends BinaryArithmeticNode<Or> implements BinaryCommutative<ValueNode>, NarrowableArithmeticNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/PointerEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/PointerEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "==") public class PointerEqualsNode extends CompareNode implements BinaryCommutative<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.nodes.calc; -import java.nio.*; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.SerializableConstant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.ArithmeticStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * The {@code ReinterpretNode} class represents a reinterpreting conversion that changes the stamp
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RemNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RemNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Rem; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "%") public final class RemNode extends BinaryArithmeticNode<Rem> implements Lowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeUtil; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp.Shr; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = ">>") public final class RightShiftNode extends ShiftNode<Shr> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,22 @@ */ package com.oracle.graal.nodes.calc; -import java.io.*; -import java.util.function.*; +import java.io.Serializable; +import java.util.function.Function; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; /** * The {@code ShiftOp} class represents shift operations.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * The {@code SignExtendNode} converts an integer to a wider integer using sign extension.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SqrtNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SqrtNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.UnaryOp.Sqrt; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * Square root.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SubNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SubNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,23 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Sub; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "-") public class SubNode extends BinaryArithmeticNode<Sub> implements NarrowableArithmeticNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryArithmeticNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryArithmeticNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.nodes.calc; -import java.io.*; -import java.util.function.*; +import java.io.Serializable; +import java.util.function.Function; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.UnaryOp; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; @NodeInfo public abstract class UnaryArithmeticNode<OP> extends UnaryNode implements ArithmeticLIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnaryNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.calc; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; /** * The {@code UnaryNode} class is the base of arithmetic and bit logic operations with exactly one
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.UnsignedMath; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(shortName = "|/|") public class UnsignedDivNode extends FixedBinaryNode implements Lowerable, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.code.UnsignedMath; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(shortName = "|%|") public class UnsignedRemNode extends FixedBinaryNode implements Lowerable, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,18 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp.UShr; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = ">>>") public final class UnsignedRightShiftNode extends ShiftNode<UShr> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,24 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.PrimitiveConstant; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Xor; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo(shortName = "^") public final class XorNode extends BinaryArithmeticNode<Xor> implements BinaryCommutative<ValueNode>, NarrowableArithmeticNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,22 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CodeUtil; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * The {@code ZeroExtendNode} converts an integer to a wider integer using zero extension.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.nodes.cfg; -import java.util.*; +import java.util.Iterator; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; public final class Block extends AbstractBlockBase<Block> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,32 @@ */ package com.oracle.graal.nodes.cfg; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; - -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.CFGVerifier; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; public class ControlFlowGraph implements AbstractControlFlowGraph<Block> { /**
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/HIRLoop.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/HIRLoop.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.cfg; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.nodes.LoopBeginNode; public final class HIRLoop extends Loop<Block> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/LocationSet.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/LocationSet.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.nodes.cfg; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; public class LocationSet { private LocationIdentity firstLocation;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/BlackholeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/BlackholeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes.debug; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class BlackholeNode extends FixedWithNextNode implements LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/ControlFlowAnchorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/ControlFlowAnchorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.nodes.debug; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * This node prevents control flow optimizations. It is never duplicated or merged with other
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.nodes.debug; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * This node can be used to add a counter to the code that will estimate the dynamic number of calls
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/OpaqueNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/OpaqueNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes.debug; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class OpaqueNode extends FloatingNode implements LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/VerifyHeapNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/VerifyHeapNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.nodes.debug; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * A node for platform dependent verification of the Java heap. Intended to be used for debugging
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.nodes.debug; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * This is a special version of the dynamic counter node that removes itself as soon as it's the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AnchoringNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AnchoringNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.nodes.ValueNode; public interface AnchoringNode extends NodeInterface {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ArrayRangeWriteNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ArrayRangeWriteNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; /** * Base class for nodes that modify a range of an array.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,25 @@ */ package com.oracle.graal.nodes.extended; -import java.util.*; +import java.util.Collections; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualBoxingNode; /** * This node represents the boxing of a primitive value. This corresponds to a call to the valueOf
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.calc.IntegerEqualsNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Instances of this node class will look for a preceding if node and put the given probability into
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * A node that represents an exception thrown implicitly by a Java bytecode. It can be lowered to
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.ValueProxy; @NodeInfo public final class FixedValueAnchorNode extends FixedWithNextNode implements LIRLowerable, ValueProxy {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,30 @@ */ package com.oracle.graal.nodes.extended; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Node for a {@linkplain ForeignCallDescriptor foreign} call.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GetClassNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GetClassNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,26 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * Loads an object's class (i.e., this node can be created for {@code object.getClass()}).
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.nodes.ValueNode; /** * A node that may be guarded by a {@linkplain GuardingNode guarding node}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardingNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardingNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.nodes.ValueNode; public interface GuardingNode extends NodeInterface {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.nodes.extended; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * The {@code IntegerSwitchNode} represents a switch on integer keys, with a sorted array of key
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.memory.FixedAccessNode; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Read a raw memory location according to Java field or array read semantics. It will perform read
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractWriteNode; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Write a raw memory location according to Java field or array write semantics. It will perform
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,26 @@ */ package com.oracle.graal.nodes.extended; +import jdk.internal.jvmci.meta.Assumptions; import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FloatingGuardedNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; /** * Loads an object's hub. The object is not null-checked by this operation.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,25 @@ */ package com.oracle.graal.nodes.extended; -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; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.type.StampTool; /** * Loads a method from the virtual method table of a given hub.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Creates a memory barrier.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MonitorExit.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MonitorExit.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; /** * Denotes monitor unlocking transition.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingFixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(allowedUsageTypes = {InputType.Guard}) public final class NullCheckNode extends DeoptimizingFixedWithNextNode implements LIRLowerable, GuardingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRLocalNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRLocalNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractLocalNode; @NodeInfo(nameTemplate = "OSRLocal({p#index})") public final class OSRLocalNode extends AbstractLocalNode implements IterableNodeType {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRStartNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/OSRStartNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo public final class OSRStartNode extends StartNode implements Lowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/StoreHubNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/StoreHubNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo public final class StoreHubNode extends FixedWithNextNode implements Lowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.nodes.extended; -import java.util.*; +import java.util.Arrays; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeSuccessorList; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.ValueNode; /** * The {@code SwitchNode} class is the base of both lookup and table switches.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,26 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; @NodeInfo public final class UnboxNode extends FixedWithNextNode implements Virtualizable, Lowerable, Canonicalizable.Unary<ValueNode> {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.type.StampTool; @NodeInfo public abstract class UnsafeAccessNode extends FixedWithNextNode implements Canonicalizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,27 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FloatingGuardedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code UnsafeCastNode} produces the same value as its input, but with a different type. It
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCopyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCopyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; /** * Copy a value at a location specified as an offset relative to a source object to another location
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,22 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaField; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * Load of a value from a location specified as an offset relative to an object. No null check is
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,26 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaField; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * Store of a value at a location specified as an offset relative to an object. No null check is
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,25 @@ */ package com.oracle.graal.nodes.extended; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.memory.FixedAccessNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The ValueAnchor instruction keeps non-CFG (floating) nodes above a certain point in the graph.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; /** * The {@code AbstractNewArrayNode} is used for all 1-dimensional array allocations.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewObjectNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewObjectNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.nodes.java; -import java.util.*; +import java.util.List; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingFixedWithNextNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.extended.FixedValueAnchorNode; +import com.oracle.graal.nodes.memory.WriteNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The {@code AbstractNewObjectNode} is the base class for the new instance and new array nodes.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; /** * This the base class of all array operations.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaField; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The base class of all instructions that access fields.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The {@code AccessIndexedNode} class is the base class of instructions that read or write elements
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; /** * The {@code AccessMonitorNode} is the base class of both monitor acquisition and release.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,24 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * The {@code ArrayLength} instruction gets the length of an array.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; -import sun.misc.*; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; +import sun.misc.Unsafe; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Represents an atomic read-and-add operation like {@link Unsafe#getAndAddInt(Object, long, int)}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; -import sun.misc.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import sun.misc.Unsafe; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Represents an atomic read-and-write operation like {@link Unsafe#getAndSetInt(Object, long, int)}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.type.StampTool; /** * Implements a type check where the type being checked is loaded at runtime. This is used, for
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,45 @@ */ package com.oracle.graal.nodes.java; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.ArrayStoreException; +import static jdk.internal.jvmci.meta.DeoptimizationReason.ClassCastException; +import static jdk.internal.jvmci.meta.DeoptimizationReason.UnreachedCode; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; /** * Implements a type check against a compile-time known type.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ClassIsAssignableFromNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ClassIsAssignableFromNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,19 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The {@code ClassIsAssignableFromNode} represents a type check against {@link Class} instead of
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Represents an atomic compare-and-swap operation The result is a boolean that contains whether the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,13 +23,20 @@ //JaCoCo Exclude package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; /** * The {@code DynamicNewArrayNode} is used for allocation of arrays when the type is not a
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.nodes.java; -import java.lang.reflect.*; +import java.lang.reflect.Modifier; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; @NodeInfo public class DynamicNewInstanceNode extends AbstractNewObjectNode implements Canonicalizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.DispatchBeginNode; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.KillingBeginNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The entry to an exception handler with the exception coming from a call (as opposed to a local
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ForeignCallDescriptors.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ForeignCallDescriptors.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; /** * The foreign call descriptors used by nodes in this package.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,19 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The {@code InstanceOfDynamicNode} represents a type check where the type being checked is not
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,28 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNegationNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.UnaryOpLogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; /** * The {@code InstanceOfNode} represents an instanceof test.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadExceptionObjectNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadExceptionObjectNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractStateSplit; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo public final class LoadExceptionObjectNode extends AbstractStateSplit implements Lowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,33 @@ */ package com.oracle.graal.nodes.java; -import static com.oracle.graal.graph.iterators.NodePredicates.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +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.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.spi.UncheckedInterfaceProvider; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code LoadFieldNode} represents a read of a static or instance field.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,26 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code LoadIndexedNode} represents a read from an element of an array.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,21 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; -import sun.misc.*; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; +import sun.misc.Unsafe; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.FixedAccessNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Represents the lowered version of an atomic read-and-write operation like
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,25 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.FixedAccessNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Represents the lowered version of an atomic compare-and-swap operation{@code CompareAndSwapNode}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,35 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.UncheckedInterfaceProvider; +import com.oracle.graal.nodes.type.StampTool; @NodeInfo public class MethodCallTargetNode extends CallTargetNode implements IterableNodeType, Simplifiable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.MonitorEnter; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code MonitorEnterNode} represents the acquisition of a monitor.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.MonitorExit; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code MonitorExitNode} represents a monitor release. If it is the release of the monitor of
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.nodes.java; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * This node describes one locking scope; it ties the monitor enter, monitor exit and the frame
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.graal.nodes.java; -import java.util.*; +import java.util.Collections; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code NewArrayNode} is used for all array allocations where the element type is know at
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.graal.nodes.java; -import java.lang.ref.*; -import java.util.*; +import java.lang.ref.Reference; +import java.util.Collections; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; /** * The {@code NewInstanceNode} represents the allocation of an instance class object.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.NodeList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingFixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * The {@code NewMultiArrayNode} represents an allocation of a multi-dimensional object array.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RawMonitorEnterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RawMonitorEnterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.MonitorEnter; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code MonitorEnterNode} represents the acquisition of a monitor. The object needs already be
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,27 @@ */ package com.oracle.graal.nodes.java; -import static com.oracle.graal.nodes.java.ForeignCallDescriptors.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import static com.oracle.graal.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractStateSplit; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * This node is used to perform the finalizer registration at the end of the java.lang.Object
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaField; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code StoreFieldNode} represents a write to a static or instance field.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,22 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * The {@code StoreIndexedNode} represents a write to an array element.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,25 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.UnaryOpLogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; /** * The {@code TypeCheckNode} represents a test equivalent to {@code o.getClass() == type}. The node
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,27 @@ */ package com.oracle.graal.nodes.java; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.extended.SwitchNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * The {@code TypeSwitchNode} performs a lookup based on the type of the input value. The type
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/AbstractMemoryCheckpoint.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/AbstractMemoryCheckpoint.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.nodes.memory; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractStateSplit; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; /** * Provides an implementation of {@link StateSplit}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/AbstractWriteNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/AbstractWriteNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValueNodeUtil; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.address.AddressNode; @NodeInfo(allowedUsageTypes = {InputType.Memory}) public abstract class AbstractWriteNode extends FixedAccessNode implements StateSplit, MemoryCheckpoint.Single, MemoryAccess, GuardingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/Access.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/Access.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.nodes.extended.GuardedNode; +import com.oracle.graal.nodes.memory.address.AddressNode; public interface Access extends GuardedNode, HeapAccess {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FixedAccessNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FixedAccessNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.DeoptimizingFixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.address.AddressNode; /** * Accesses a value at an memory address specified by an {@linkplain #address address}. The access
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatableAccessNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatableAccessNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.address.AddressNode; /** * An {@link FixedAccessNode} that can be converted to a {@link FloatingAccessNode}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingAccessNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingAccessNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FloatingGuardedNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.address.AddressNode; @NodeInfo public abstract class FloatingAccessNode extends FloatingGuardedNode implements Access, MemoryAccess {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingReadNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingReadNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNodeUtil; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * A floating read of a value from memory specified in terms of an object base and an object
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryAccess.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryAccess.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; /** * This interface marks nodes that access some memory location, and that have an edge to the last
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryAnchorNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryAnchorNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.nodes.memory; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodeinfo.StructuralInput.Memory; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(allowedUsageTypes = {InputType.Memory}) public final class MemoryAnchorNode extends FixedWithNextNode implements LIRLowerable, MemoryNode, Canonicalizable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryCheckpoint.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryCheckpoint.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.FixedNode; /** * This interface marks subclasses of {@link FixedNode} that kill a set of memory locations
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.memory; -import java.util.*; +import java.util.Collection; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; /** * Maps a {@linkplain LocationIdentity location} to the last node that (potentially) wrote to the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMapNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMapNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,27 @@ */ package com.oracle.graal.nodes.memory; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(allowedUsageTypes = {InputType.Extension, InputType.Memory}) public final class MemoryMapNode extends FloatingNode implements MemoryMap, MemoryNode, LIRLowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.memory; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.nodes.ValueNode; /** * This interface marks nodes that are part of the memory graph.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryPhiNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryPhiNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ValueNode; /** * Memory {@code PhiNode}s merge memory dependencies at control flow merges.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/ReadNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/ReadNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,36 @@ */ package com.oracle.graal.nodes.memory; -import static com.oracle.graal.nodes.NamedLocationIdentity.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.CanonicalizableLocation; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * Reads an {@linkplain FixedAccessNode accessed} value.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/WriteNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/WriteNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.address.AddressNode; import com.oracle.graal.nodes.memory.address.AddressNode.Address; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; /** * Writes a given {@linkplain #value() value} a {@linkplain FixedAccessNode memory location}.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/AddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/AddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.nodes.memory.address; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.StructuralInput; +import com.oracle.graal.nodes.calc.FloatingNode; /** * Base class for nodes that deal with addressing calculation.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/OffsetAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/OffsetAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.nodes.memory.address; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.BinaryArithmeticNode; +import com.oracle.graal.nodes.spi.PiPushable; +import com.oracle.graal.nodes.type.StampTool; /** * Represents an address that is composed of a base and an offset. The base can be either a
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/RawAddressNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/RawAddressNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.nodes.memory.address; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; /** * Convert a word-sized integer to a raw address.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArithmeticLIRLowerable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArithmeticLIRLowerable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodes.ArithmeticOperation; public interface ArithmeticLIRLowerable extends ArithmeticOperation {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArrayLengthProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArrayLengthProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ValueNode; public interface ArrayLengthProvider {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LimitedValueProxy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LimitedValueProxy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ValueNode; /** * This interface is like the derived {@link ValueProxy}. The difference is that only the graph
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.nodes.ValueNode; /** * Interface implemented by nodes that can replace themselves with lower level nodes during a phase
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; /** * Provides a capability for replacing a higher node with one or more lower level nodes.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,17 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.extended.AnchoringNode; +import com.oracle.graal.nodes.extended.GuardingNode; public interface LoweringTool {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/MemoryProxy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/MemoryProxy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.nodes.memory.MemoryNode; public interface MemoryProxy extends Proxy, MemoryNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,33 @@ */ package com.oracle.graal.nodes.spi; -import java.util.*; +import java.util.Collection; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.lir.LIRFrameState; +import com.oracle.graal.lir.gen.LIRGeneratorTool; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BreakpointNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.SafepointNode; +import com.oracle.graal.nodes.SimpleInfopointNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.extended.SwitchNode; public interface NodeLIRBuilderTool extends NodeValueMap {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeValueMap.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeValueMap.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,10 +23,10 @@ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ValueNode; public interface NodeValueMap {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeWithState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeWithState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInterface; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.FrameState; /** * Interface for nodes which have {@link FrameState} nodes as input.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/PiPushable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/PiPushable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.PiNode; /** * This interface marks nodes, which are able to be pushed through a PiNode.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Proxy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Proxy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeInterface; /** * This interface marks nodes whose result is the same as one of their inputs. Such nodes are used
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.nodes.spi; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Type; +import java.util.Collection; + +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.api.replacements.SnippetTemplateCache; +import com.oracle.graal.nodes.StructuredGraph; /** * Interface for managing replacements.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ReplacementsProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ReplacementsProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.api.replacements.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; /** * Interface for service providers that register replacements with the compiler.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/StampProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/StampProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.nodes.spi; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.nodes.extended.LoadHubNode; /** * Provides a capability for creating platform dependent stamps.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/UncheckedInterfaceProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/UncheckedInterfaceProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; public interface UncheckedInterfaceProvider { /**
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/VirtualizerTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/VirtualizerTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.nodes.spi; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import java.util.List; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; + +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * This tool can be used to query the current state (normal/virtualized/re-materialized) of values
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.nodes.type; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; + +import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.AbstractObjectStamp; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.nodes.ValueNode; /** * Helper class that is used to keep all stamp-related operations in one place.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,41 @@ */ package com.oracle.graal.nodes.util; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.code.SourceStackTrace; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeWorkList; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.graph.iterators.NodePredicate; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.LimitedValueProxy; +import com.oracle.graal.nodes.spi.ValueProxy; public class GraphUtil {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/AllocatedObjectNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/AllocatedObjectNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.nodes.virtual; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; /** * Selects one object from a {@link CommitAllocationNode}. The object is identified by its
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,27 @@ */ package com.oracle.graal.nodes.virtual; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; @NodeInfo(nameTemplate = "Alloc {i#virtualObjects}", allowedUsageTypes = {InputType.Extension}) public final class CommitAllocationNode extends FixedWithNextNode implements VirtualizableAllocation, Lowerable, Simplifiable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EnsureVirtualizedNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EnsureVirtualizedNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,19 @@ */ package com.oracle.graal.nodes.virtual; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.VerificationError; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo public final class EnsureVirtualizedNode extends FixedWithNextNode implements Virtualizable, Lowerable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.nodes.virtual; import com.oracle.graal.graph.Node.ValueNumberable; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.VirtualState; @NodeInfo public abstract class EscapeObjectState extends VirtualState implements ValueNumberable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/LockState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/LockState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.nodes.virtual; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.java.MonitorIdNode; /** * The class implements a simple linked list of MonitorIdNodes, which can be used to describe the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.nodes.virtual; -import java.nio.*; +import java.nio.ByteOrder; -import jdk.internal.jvmci.meta.*; -import sun.misc.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import sun.misc.Unsafe; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo(nameTemplate = "VirtualArray {p#componentType/s}[{p#length}]") public class VirtualArrayNode extends VirtualObjectNode implements ArrayLengthProvider {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.nodes.virtual; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.BoxNode; @NodeInfo public final class VirtualBoxingNode extends VirtualInstanceNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,15 @@ */ package com.oracle.graal.nodes.virtual; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.ValueNode; @NodeInfo(nameTemplate = "VirtualInstance {p#type/s}") public class VirtualInstanceNode extends VirtualObjectNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.nodes.virtual; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public abstract class VirtualObjectNode extends ValueNode implements LIRLowerable, IterableNodeType {
--- a/graal/com.oracle.graal.phases.common.test/src/com/oracle/graal/phases/common/test/StampFactoryTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common.test/src/com/oracle/graal/phases/common/test/StampFactoryTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.phases.common.test; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.runtime.RuntimeProvider; public class StampFactoryTest {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/AbstractInliningPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/AbstractInliningPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.tiers.HighTierContext; /** * Common superclass for phases that perform inlining.
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/AddressLoweringPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/AddressLoweringPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.memory.address.RawAddressNode; +import com.oracle.graal.phases.Phase; public class AddressLoweringPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,36 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graph.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Graph.Mark; import com.oracle.graal.graph.Graph.NodeEventListener; import com.oracle.graal.graph.Graph.NodeEventScope; -import com.oracle.graal.graph.spi.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeWorkList; +import com.oracle.graal.graph.spi.Canonicalizable; import com.oracle.graal.graph.spi.Canonicalizable.BinaryCommutative; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.tiers.PhaseContext; public class CanonicalizerPhase extends BasePhase<PhaseContext> {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,64 @@ */ package com.oracle.graal.phases.common; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.nodes.ConditionAnchorNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.ShortCircuitOrNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerEqualsNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.calc.ObjectEqualsNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.TypeSwitchNode; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.graph.MergeableState; +import com.oracle.graal.phases.graph.SinglePassNodeIterator; public class ConditionalEliminationPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,41 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; + +import java.util.List; -import java.util.*; - -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * This phase will find branches which always end with a {@link DeoptimizeNode} and replace their
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,21 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Options.*; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Options.ReduceDCE; + +import java.util.function.BiConsumer; -import java.util.function.*; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.options.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeFlood; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.Phase; public class DeadCodeEliminationPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeoptimizationGroupingPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeoptimizationGroupingPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,28 @@ */ package com.oracle.graal.phases.common; -import java.util.*; +import java.util.LinkedList; +import java.util.List; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.nodes.AbstractDeoptimizeNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.DynamicDeoptimizeNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.tiers.MidTierContext; /** * This phase tries to find {@link AbstractDeoptimizeNode DeoptimizeNodes} which use the same
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,58 @@ */ package com.oracle.graal.phases.common; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.UnreachedCode; -import java.util.*; -import java.util.function.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.function.Function; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.BinaryOpLogicNode; +import com.oracle.graal.nodes.ConditionAnchorNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.GuardProxyNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ShortCircuitOrNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.UnaryOpLogicNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.IntegerSwitchNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.nodes.java.TypeSwitchNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; import com.oracle.graal.phases.common.LoweringPhase.Frame; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.phases.schedule.SchedulePhase; public class DominatorConditionalEliminationPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ExpandLogicPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ExpandLogicPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,22 @@ */ package com.oracle.graal.phases.common; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.ShortCircuitOrNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.phases.Phase; public class ExpandLogicPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,57 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.graph.Graph.NodeEvent.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; - -import java.util.*; +import static com.oracle.graal.graph.Graph.NodeEvent.NODE_ADDED; +import static com.oracle.graal.graph.Graph.NodeEvent.ZERO_USAGES; +import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.meta.*; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; +import jdk.internal.jvmci.meta.LocationIdentity; + +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.Loop; import com.oracle.graal.graph.Graph.NodeEventScope; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.util.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNodeUtil; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.cfg.HIRLoop; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.memory.FloatableAccessNode; +import com.oracle.graal.nodes.memory.FloatingAccessNode; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryAnchorNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryMap; +import com.oracle.graal.nodes.memory.MemoryMapNode; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.memory.MemoryPhiNode; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.common.util.HashSetNodeEventListener; +import com.oracle.graal.phases.graph.ReentrantNodeIterator; import com.oracle.graal.phases.graph.ReentrantNodeIterator.LoopInfo; import com.oracle.graal.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FrameStateAssignmentPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FrameStateAssignmentPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,26 @@ */ package com.oracle.graal.phases.common; -import java.util.*; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.iterators.NodePredicate; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.GuardsStage; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.graph.ReentrantNodeIterator; import com.oracle.graal.phases.graph.ReentrantNodeIterator.NodeIteratorClosure; /**
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,45 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.OptImplicitNullChecks; -import java.util.*; +import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.GuardsStage; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.graph.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.memory.Access; +import com.oracle.graal.nodes.memory.FixedAccessNode; +import com.oracle.graal.nodes.memory.FloatingAccessNode; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.graph.ScheduledNodeIterator; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.tiers.MidTierContext; /** * This phase lowers {@link GuardNode GuardNodes} into corresponding control-flow structure and
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,10 +23,11 @@ package com.oracle.graal.phases.common; import com.oracle.graal.graph.Graph.NodeEventScope; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.util.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.common.util.HashSetNodeEventListener; +import com.oracle.graal.phases.tiers.PhaseContext; /** * A phase suite that applies {@linkplain CanonicalizerPhase canonicalization} to a graph after all
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.phases.common; -import jdk.internal.jvmci.code.*; -import static com.oracle.graal.graph.Graph.NodeEvent.*; +import static com.oracle.graal.graph.Graph.NodeEvent.NODE_ADDED; +import static com.oracle.graal.graph.Graph.NodeEvent.ZERO_USAGES; +import jdk.internal.jvmci.code.BailoutException; import com.oracle.graal.graph.Graph.NodeEventScope; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.util.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.common.util.HashSetNodeEventListener; +import com.oracle.graal.phases.tiers.PhaseContext; public class IterativeConditionalEliminationPhase extends BasePhase<PhaseContext> {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LockEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LockEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.java.AccessMonitorNode; +import com.oracle.graal.nodes.java.MonitorEnterNode; +import com.oracle.graal.nodes.java.MonitorExitNode; +import com.oracle.graal.nodes.java.RawMonitorEnterNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; public class LockEliminationPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoopSafepointInsertionPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoopSafepointInsertionPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.GenLoopSafepoints; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.SafepointNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.Phase; /** * Adds safepoints to loops.
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,56 @@ */ package com.oracle.graal.phases.common; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.phases.common.LoweringPhase.ProcessBlockState.*; - -import java.util.*; +import static com.oracle.graal.compiler.common.GraalOptions.OptEliminateGuards; +import static com.oracle.graal.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER; +import static com.oracle.graal.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER_ALWAYS_REACHED; +import static com.oracle.graal.phases.common.LoweringPhase.ProcessBlockState.ST_LEAVE; +import static com.oracle.graal.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS; +import static com.oracle.graal.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS_ALWAYS_REACHED; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; -import com.oracle.graal.compiler.common.type.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaAccessProvider; + +import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Graph.Mark; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.extended.AnchoringNode; +import com.oracle.graal.nodes.extended.GuardedNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Processes all {@link Lowerable} nodes to do their lowering.
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/NonNullParametersPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/NonNullParametersPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.Phase; /** * Modifies the stamp of all object {@linkplain ParameterNode parameters} in a graph to denote they
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchorsPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchorsPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,24 @@ */ package com.oracle.graal.phases.common; -import java.util.*; - -import com.oracle.graal.debug.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.AnchoringNode; +import com.oracle.graal.phases.Phase; public class OptimizeGuardAnchorsPhase extends Phase { private static final DebugMetric metricGuardsAnchorOptimized = Debug.metric("GuardsAnchorOptimized");
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ProfileCompiledMethodsPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ProfileCompiledMethodsPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,49 @@ */ package com.oracle.graal.phases.common; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.SafepointNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.UnwindNode; +import com.oracle.graal.nodes.VirtualState; +import com.oracle.graal.nodes.calc.BinaryNode; +import com.oracle.graal.nodes.calc.ConvertNode; +import com.oracle.graal.nodes.calc.DivNode; +import com.oracle.graal.nodes.calc.IntegerDivNode; +import com.oracle.graal.nodes.calc.IntegerRemNode; +import com.oracle.graal.nodes.calc.MulNode; +import com.oracle.graal.nodes.calc.NotNode; +import com.oracle.graal.nodes.calc.ReinterpretNode; +import com.oracle.graal.nodes.calc.RemNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.debug.DynamicCounterNode; +import com.oracle.graal.nodes.extended.SwitchNode; +import com.oracle.graal.nodes.java.AbstractNewObjectNode; +import com.oracle.graal.nodes.java.AccessMonitorNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.memory.Access; +import com.oracle.graal.nodes.spi.ValueProxy; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.schedule.SchedulePhase; /** * This phase add counters for the dynamically executed number of nodes. Incrementing the counter
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/PushThroughPiPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/PushThroughPiPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.debug.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.PiPushable; +import com.oracle.graal.phases.Phase; public class PushThroughPiPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/RemoveValueProxyPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/RemoveValueProxyPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,13 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; public class RemoveValueProxyPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,34 @@ */ package com.oracle.graal.phases.common; -import java.util.*; +import java.util.List; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractDeoptimizeNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.DynamicDeoptimizeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.extended.NullCheckNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.tiers.LowTierContext; public class UseTrappingNullChecksPhase extends BasePhase<LowTierContext> {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ValueAnchorCleanupPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ValueAnchorCleanupPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,19 @@ */ package com.oracle.graal.phases.common; -import java.util.*; +import java.util.List; +import java.util.Set; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.phases.graph.MergeableState; +import com.oracle.graal.phases.graph.SinglePassNodeIterator; /** * This phase performs a bit of hygiene on {@link ValueAnchorNode} by removing inputs that have
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/VerifyHeapAtReturnPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/VerifyHeapAtReturnPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.phases.common; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.debug.VerifyHeapNode; +import com.oracle.graal.phases.Phase; public class VerifyHeapAtReturnPhase extends Phase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.phases.common.inlining; -import java.util.*; +import java.util.Map; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.policy.*; -import com.oracle.graal.phases.common.inlining.walker.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.common.AbstractInliningPhase; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.policy.GreedyInliningPolicy; +import com.oracle.graal.phases.common.inlining.policy.InliningPolicy; +import com.oracle.graal.phases.common.inlining.walker.InliningData; +import com.oracle.graal.phases.tiers.HighTierContext; public class InliningPhase extends AbstractInliningPhase {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,35 +22,78 @@ */ package com.oracle.graal.phases.common.inlining; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; +import static com.oracle.graal.compiler.common.GraalOptions.HotSpotPrintInlining; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.NullCheckException; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.Scope; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.Fingerprint; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.GraalGraphJVMCIError; +import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Graph.DuplicationReplacement; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.NodeWorkList; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.common.inlining.info.*; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.GuardedValueNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.KillingBeginNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.SimpleInfopointNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.UnwindNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.java.ExceptionObjectNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.common.inlining.info.InlineInfo; public class InliningUtil {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.phases.common.inlining.info; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.common.inlining.info.elem.InlineableGraph; +import com.oracle.graal.phases.tiers.HighTierContext; public abstract class AbstractInlineInfo implements InlineInfo {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AssumptionInlineInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AssumptionInlineInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,16 @@ */ package com.oracle.graal.phases.common.inlining.info; -import java.util.*; +import java.util.Collection; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.util.Providers; /** * Represents an inlining opportunity where the current class hierarchy leads to a monomorphic
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/ExactInlineInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/ExactInlineInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.phases.common.inlining.info; -import java.util.*; +import java.util.Collection; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.util.Providers; /** * Represents an inlining opportunity where the compiler can statically determine a monomorphic
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,17 @@ */ package com.oracle.graal.phases.common.inlining.info; -import java.util.*; +import java.util.Collection; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.util.Providers; /** * Represents an opportunity for inlining at a given invoke, with the given weight and level. The
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,48 @@ */ package com.oracle.graal.phases.common.inlining.info; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.DeoptimizationReason; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; - -import java.util.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.GuardedValueNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.java.ExceptionObjectNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.TypeSwitchNode; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.util.Providers; /** * Polymorphic inlining of m methods with n type checks (n ≥ m) in case that the profiling
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/TypeGuardInlineInfo.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/TypeGuardInlineInfo.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,27 @@ */ package com.oracle.graal.phases.common.inlining.info; -import java.util.*; +import java.util.Collection; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.util.Providers; /** * Represents an inlining opportunity for which profiling information suggests a monomorphic
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/Inlineable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/Inlineable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.phases.common.inlining.info.elem; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.HighTierContext; public interface Inlineable {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,30 @@ */ package com.oracle.graal.phases.common.inlining.info.elem; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import com.oracle.graal.debug.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.graph.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.graph.FixedNodeProbabilityCache; +import com.oracle.graal.phases.tiers.HighTierContext; /** * <p>
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,19 @@ */ package com.oracle.graal.phases.common.inlining.policy; -import static com.oracle.graal.phases.common.inlining.InliningPhase.Options.*; +import static com.oracle.graal.phases.common.inlining.InliningPhase.Options.AlwaysInlineIntrinsics; -import java.util.*; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.info.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.common.inlining.info.InlineInfo; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; public abstract class AbstractInliningPolicy implements InliningPolicy { public static final float RelevanceCapForInlining = 1.0f;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,23 @@ */ package com.oracle.graal.phases.common.inlining.policy; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.InlineEverything; +import static com.oracle.graal.compiler.common.GraalOptions.LimitInlinedInvokes; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumDesiredSize; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumInliningSize; +import static com.oracle.graal.compiler.common.GraalOptions.SmallCompiledLowLevelGraphSize; +import static com.oracle.graal.compiler.common.GraalOptions.TrivialInliningSize; -import java.util.*; - -import com.oracle.graal.debug.*; +import java.util.Map; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.info.*; -import com.oracle.graal.phases.common.inlining.walker.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.common.inlining.info.InlineInfo; +import com.oracle.graal.phases.common.inlining.walker.MethodInvocation; public class GreedyInliningPolicy extends AbstractInliningPolicy {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineEverythingPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineEverythingPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.phases.common.inlining.policy; -import jdk.internal.jvmci.code.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumDesiredSize; +import jdk.internal.jvmci.code.BailoutException; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.inlining.walker.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.phases.common.inlining.walker.MethodInvocation; public class InlineEverythingPolicy implements InliningPolicy {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.phases.common.inlining.policy; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.inlining.walker.*; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.phases.common.inlining.walker.MethodInvocation; /** * Inline every method which would be replaced by a substitution. Useful for testing purposes.
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InliningPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InliningPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.phases.common.inlining.policy; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.inlining.walker.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.phases.common.inlining.walker.MethodInvocation; public interface InliningPolicy {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; /** * Information about a graph that will potentially be inlined. This includes tracking the
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,22 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import java.util.*; -import java.util.function.*; +import java.util.BitSet; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Set; +import java.util.function.ToDoubleFunction; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.inlining.policy.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.phases.common.inlining.policy.AbstractInliningPolicy; +import com.oracle.graal.phases.graph.FixedNodeProbabilityCache; /** * <p>
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/ComputeInliningRelevance.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/ComputeInliningRelevance.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,27 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import java.util.*; -import java.util.function.*; +import java.util.ArrayList; +import java.util.Map; +import java.util.function.ToDoubleFunction; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.SuppressFBWarnings; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeWorkList; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; public class ComputeInliningRelevance {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,31 +22,52 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import static com.oracle.graal.compiler.common.GraalOptions.*; - -import java.util.*; +import static com.oracle.graal.compiler.common.GraalOptions.Intrinsify; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumRecursiveInlining; +import static com.oracle.graal.compiler.common.GraalOptions.MegamorphicInliningMinMethodProbability; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Collection; +import java.util.Iterator; +import java.util.Set; -import com.oracle.graal.debug.*; - -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.info.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; -import com.oracle.graal.phases.common.inlining.policy.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.AbstractNewObjectNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.common.inlining.info.AssumptionInlineInfo; +import com.oracle.graal.phases.common.inlining.info.ExactInlineInfo; +import com.oracle.graal.phases.common.inlining.info.InlineInfo; +import com.oracle.graal.phases.common.inlining.info.MultiTypeGuardInlineInfo; +import com.oracle.graal.phases.common.inlining.info.TypeGuardInlineInfo; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.common.inlining.info.elem.InlineableGraph; +import com.oracle.graal.phases.common.inlining.policy.InliningPolicy; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.util.Providers; /** * <p>
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,26 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.Iterator; +import java.util.LinkedList; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.java.MethodCallTargetNode; /** * Given a graph, visit all fixed nodes in dominator-based order, collecting in the process the
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/MethodInvocation.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/MethodInvocation.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import java.util.*; +import java.util.BitSet; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.inlining.info.*; -import com.oracle.graal.phases.common.inlining.info.elem.*; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.phases.common.inlining.info.InlineInfo; +import com.oracle.graal.phases.common.inlining.info.elem.Inlineable; +import com.oracle.graal.phases.common.inlining.info.elem.InlineableGraph; /** * <p>
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/util/HashSetNodeEventListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/util/HashSetNodeEventListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.phases.common.util; -import java.util.*; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Set; import com.oracle.graal.graph.Graph.NodeEvent; import com.oracle.graal.graph.Graph.NodeEventListener; -import com.oracle.graal.graph.*; +import com.oracle.graal.graph.Node; /** * A simple {@link NodeEventListener} implementation that accumulates event nodes in a
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,17 @@ */ package com.oracle.graal.phases; -import java.util.regex.*; +import java.util.regex.Pattern; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugMemUseTracker; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.Fingerprint; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.nodes.StructuredGraph; /** * Base class for all compiler phases. Subclasses should be stateless. There will be one global
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/LazyName.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/LazyName.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.Debug; /** * A name whose {@link String} value is computed only when it is needed. This is useful in
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.phases; -import java.util.*; +import java.util.EnumSet; +import java.util.Set; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.ProfilingInfo; -import com.oracle.graal.compiler.common.*; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; public final class OptimisticOptimizations {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/Phase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/Phase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; /** * Base class for compiler phases that don't need a context object.
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/PhaseSuite.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/PhaseSuite.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.phases; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; /** * A compiler phase that can apply an ordered collection of phases to a graph.
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/VerifyPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/VerifyPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; /*** * This phase serves as a verification, in order to check the graph for certain properties. The
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/FixedNodeProbabilityCache.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/FixedNodeProbabilityCache.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,21 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; -import java.util.function.*; +import java.util.Map; +import java.util.function.ToDoubleFunction; -import com.oracle.graal.debug.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.StartNode; /** * Compute probabilities for fixed nodes on the fly and cache them at {@link AbstractBeginNode}s.
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/InferStamps.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/InferStamps.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.phases.graph; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; public class InferStamps {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/MergeableState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/MergeableState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,13 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.List; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; public abstract class MergeableState<T> {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,26 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.Map; +import java.util.Set; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.StructuredGraph; /** * A PostOrderNodeIterator iterates the fixed nodes of the graph in post order starting from a
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantBlockIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantBlockIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,20 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; -import java.util.function.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.List; +import java.util.Map; +import java.util.function.Predicate; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.cfg.Block; public final class ReentrantBlockIterator {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,23 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.List; +import java.util.Map; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; public final class ReentrantNodeIterator {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScheduledNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScheduledNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.ListIterator; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.phases.schedule.SchedulePhase; /** * Iterates over a list of nodes, which usually comes from
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScopedPostOrderNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScopedPostOrderNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,24 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Deque; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.StructuredGraph; public abstract class ScopedPostOrderNodeIterator {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,28 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StructuredGraph; /** * A SinglePassNodeIterator iterates the fixed nodes of the graph in post order starting from its
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/StatelessPostOrderNodeIterator.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/StatelessPostOrderNodeIterator.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,20 @@ */ package com.oracle.graal.phases.graph; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Deque; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopEndNode; /** * This iterator implements a reverse post order iteration over the fixed nodes in the graph,
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/BlockClosure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/BlockClosure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.schedule; -import com.oracle.graal.nodes.cfg.*; +import com.oracle.graal.nodes.cfg.Block; /** * The {@code BlockClosure} interface represents a closure for iterating over blocks.
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,26 @@ */ package com.oracle.graal.phases.schedule; -import java.util.*; +import java.util.List; +import java.util.Set; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.HIRLoop; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.memory.MemoryPhiNode; +import com.oracle.graal.phases.graph.ReentrantBlockIterator; import com.oracle.graal.phases.graph.ReentrantBlockIterator.BlockIteratorClosure; public final class MemoryScheduleVerification extends BlockIteratorClosure<Set<FloatingReadNode>> {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,54 @@ */ package com.oracle.graal.phases.schedule; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.*; +import static com.oracle.graal.compiler.common.GraalOptions.OptScheduleOutOfLoops; +import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.dominates; +import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.strictlyDominates; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Formatter; +import java.util.List; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.graph.Graph.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.compiler.common.SuppressFBWarnings; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Graph.NodeEvent; +import com.oracle.graal.graph.Graph.NodeEventListener; +import com.oracle.graal.graph.Graph.NodeEventScope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graph.NodeStack; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.GuardNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.VirtualState; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.cfg.HIRLoop; +import com.oracle.graal.nodes.cfg.LocationSet; +import com.oracle.graal.nodes.memory.FloatingReadNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.memory.MemoryPhiNode; +import com.oracle.graal.phases.Phase; public final class SchedulePhase extends Phase {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,10 +23,10 @@ package com.oracle.graal.phases.tiers; import com.oracle.graal.lir.phases.AllocationPhase.AllocationContext; -import com.oracle.graal.lir.phases.*; +import com.oracle.graal.lir.phases.LIRPhaseSuite; import com.oracle.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; import com.oracle.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import com.oracle.graal.phases.*; +import com.oracle.graal.phases.PhaseSuite; public interface CompilerConfiguration {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/HighTierContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/HighTierContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.phases.tiers; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.util.Providers; public class HighTierContext extends PhaseContext {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/LowTierContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/LowTierContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.phases.util.Providers; public class LowTierContext extends PhaseContext {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/MidTierContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/MidTierContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.ProfilingInfo; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.util.Providers; public class MidTierContext extends PhaseContext {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/PhaseContext.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/PhaseContext.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,13 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.phases.util.Providers; public class PhaseContext {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.tiers; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.phases.PhaseSuite; public final class Suites {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/SuitesProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/SuitesProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.tiers; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.phases.*; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.phases.PhaseSuite; public interface SuitesProvider {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/TargetProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/TargetProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; public interface TargetProvider {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/BlockWorkList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/BlockWorkList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.util; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.AbstractMergeNode; /** * This class implements a worklist for dealing with blocks. The worklist can operate either as a
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,38 @@ */ package com.oracle.graal.phases.util; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.GraalGraphJVMCIError; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.FullInfopointNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.VirtualState; import com.oracle.graal.nodes.VirtualState.NodeClosure; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.graph.ReentrantBlockIterator; import com.oracle.graal.phases.graph.ReentrantBlockIterator.BlockIteratorClosure; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.phases.graph.StatelessPostOrderNodeIterator; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.phases.schedule.SchedulePhase.SchedulingStrategy; public final class GraphOrder {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/MethodDebugValueName.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/MethodDebugValueName.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.phases.util; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaMethod; -import com.oracle.graal.phases.*; +import com.oracle.graal.phases.LazyName; /** * Lazily computed debug value name composed of a prefix and a {@linkplain JavaMethod#getName()
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Providers.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Providers.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.phases.util; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.compiler.common.spi.CodeGenProviders; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.phases.tiers.PhaseContext; /** * A set of providers, some of which may not be present (i.e., null).
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyCallerSensitiveMethods.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyCallerSensitiveMethods.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.phases.verify; -import jdk.internal.jvmci.meta.*; -import sun.reflect.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import sun.reflect.CallerSensitive; +import sun.reflect.Reflection; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.phases.VerifyPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Verifies a method is annotated with {@link CallerSensitive} iff it calls
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyDebugUsage.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyDebugUsage.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,17 @@ */ package com.oracle.graal.phases.verify; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.phases.VerifyPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * Verifies that no argument to one of the {@link Debug#log(String)} methods is the result of
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,21 @@ */ package com.oracle.graal.phases.verify; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +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.meta.TrustedInterface; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.ObjectEqualsNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.phases.VerifyPhase; +import com.oracle.graal.phases.tiers.PhaseContext; /** * For certain types, object identity should not be used for object equality check. This phase
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BasicIdealGraphPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BasicIdealGraphPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.printer; -import java.io.*; -import java.nio.charset.*; -import java.util.*; +import java.io.BufferedOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.io.UnsupportedEncodingException; +import java.nio.charset.Charset; +import java.util.Map; import java.util.Map.Entry; /**
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,49 @@ */ package com.oracle.graal.printer; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.graph.Edges.Type.*; +import static com.oracle.graal.compiler.common.GraalOptions.PrintGraphProbabilities; +import static com.oracle.graal.compiler.common.GraalOptions.PrintIdealGraphSchedule; +import static com.oracle.graal.graph.Edges.Type.Inputs; +import static com.oracle.graal.graph.Edges.Type.Successors; -import java.io.*; -import java.nio.*; -import java.nio.channels.*; -import java.util.*; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Signature; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.CachedGraph; +import com.oracle.graal.graph.Edges; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.InputEdges; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeList; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.VirtualState; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.schedule.SchedulePhase; public class BinaryGraphPrinter implements GraphPrinter {
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,47 @@ */ package com.oracle.graal.printer; -import java.io.*; -import java.util.*; +import java.io.OutputStream; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.DebugInfo; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaUtil; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.java.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.debug.*; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.Position; +import com.oracle.graal.java.BciBlockMapping; +import com.oracle.graal.java.BytecodeDisassembler; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.LIRInstruction; +import com.oracle.graal.lir.debug.IntervalDumper; import com.oracle.graal.lir.debug.IntervalDumper.IntervalVisitor; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.schedule.SchedulePhase; /** * Utility for printing Graal IR at various compilation phases.
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,28 +22,42 @@ */ package com.oracle.graal.printer; -import java.io.*; -import java.nio.file.*; -import java.util.*; -import java.util.concurrent.atomic.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.service.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; -import com.oracle.graal.code.*; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.debug.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.java.*; -import com.oracle.graal.lir.*; -import com.oracle.graal.lir.debug.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.schedule.*; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.service.Services; + +import com.oracle.graal.code.DisassemblerProvider; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.compiler.gen.NodeLIRBuilder; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugDumpHandler; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.java.BciBlockMapping; +import com.oracle.graal.java.BytecodeDisassembler; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.debug.IntervalDumper; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.schedule.SchedulePhase; /** * Observes compilation events and uses {@link CFGPrinter} to produce a control flow graph for the
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CompilationPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CompilationPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,28 @@ */ package com.oracle.graal.printer; -import java.io.*; -import java.util.*; +import java.io.Closeable; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.code.ReferenceMap; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.code.RegisterSaveLayout; +import jdk.internal.jvmci.code.VirtualObject; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaValue; +import jdk.internal.jvmci.meta.MetaUtil; -import com.oracle.graal.debug.*; -import com.oracle.graal.lir.util.*; +import com.oracle.graal.debug.LogStream; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.lir.util.IndexedValueMap; /** * Utility for printing compilation related data structures at various compilation phases. The
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraalDebugConfigCustomizer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraalDebugConfigCustomizer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.graal.printer; -import static com.oracle.graal.compiler.common.GraalOptions.*; - -import com.oracle.graal.debug.*; +import static com.oracle.graal.compiler.common.GraalOptions.PrintBackendCFG; +import static com.oracle.graal.compiler.common.GraalOptions.PrintBinaryGraphs; +import static com.oracle.graal.compiler.common.GraalOptions.PrintCFG; +import jdk.internal.jvmci.service.ServiceProvider; -import jdk.internal.jvmci.service.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugConfig; +import com.oracle.graal.debug.DebugConfigCustomizer; +import com.oracle.graal.debug.DebugDumpHandler; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.util.GraphUtil; @ServiceProvider(DebugConfigCustomizer.class) public class GraalDebugConfigCustomizer implements DebugConfigCustomizer {
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.printer; -import java.io.*; +import java.io.Closeable; +import java.io.IOException; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.phases.schedule.SchedulePhase; interface GraphPrinter extends Closeable {
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinterDumpHandler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinterDumpHandler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,42 @@ */ package com.oracle.graal.printer; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.debug.GraalDebugConfig.*; +import static com.oracle.graal.compiler.common.GraalOptions.DumpPath; +import static com.oracle.graal.compiler.common.GraalOptions.PrintBinaryGraphPort; +import static com.oracle.graal.compiler.common.GraalOptions.PrintBinaryGraphs; +import static com.oracle.graal.compiler.common.GraalOptions.PrintIdealGraph; +import static com.oracle.graal.compiler.common.GraalOptions.PrintIdealGraphAddress; +import static com.oracle.graal.compiler.common.GraalOptions.PrintIdealGraphFile; +import static com.oracle.graal.compiler.common.GraalOptions.PrintIdealGraphPort; +import static com.oracle.graal.debug.GraalDebugConfig.asJavaMethod; -import java.io.*; -import java.net.*; -import java.nio.channels.*; -import java.nio.file.*; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.nio.channels.ClosedByInterruptException; +import java.nio.channels.FileChannel; +import java.nio.channels.SocketChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpHandler; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.phases.schedule.SchedulePhase; //JaCoCo Exclude
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,35 @@ */ package com.oracle.graal.printer; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.PrintIdealGraphSchedule; -import java.io.*; -import java.util.*; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; + +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.java.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.Position; +import com.oracle.graal.java.BytecodeDisassembler; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.schedule.SchedulePhase; /** * Generates a representation of {@link Graph Graphs} that can be visualized and inspected with the
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.printer; -import static com.oracle.graal.printer.NoDeadCodeVerifyHandler.Options.*; +import static com.oracle.graal.printer.NoDeadCodeVerifyHandler.Options.NDCV; -import java.util.*; -import java.util.concurrent.*; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.debug.DebugVerifyHandler; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; /** * Verifies that graphs have no dead code.
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,23 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; +import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.replacements.Snippet; +import com.oracle.graal.replacements.SnippetTemplate; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo; +import com.oracle.graal.replacements.Snippets; /** * Snippets used for conversion operations on AMD64 where the AMD64 instruction used does not match
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountLeadingZerosNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountLeadingZerosNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Count the number of leading zeros using the {@code lzcntq} or {@code lzcntl} instructions.
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountTrailingZerosNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountTrailingZerosNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Count the number of trailing zeros using the {@code tzcntq} or {@code tzcntl} instructions.
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.replacements.amd64; -import com.oracle.graal.compiler.common.calc.*; +import com.oracle.graal.compiler.common.calc.FloatConvert; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.FloatConvertOp; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatConvertNode; +import com.oracle.graal.nodes.calc.UnaryArithmeticNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; /** * This node has the semantics of the AMD64 floating point conversions. It is used in the lowering
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64GraphBuilderPlugins.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64GraphBuilderPlugins.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,32 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.amd64.*; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.compiler.target.Backend.*; -import static com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation.*; -import sun.misc.*; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_EXP; +import static com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation.LOG; +import static com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation.LOG10; +import jdk.internal.jvmci.amd64.AMD64; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import sun.misc.Unsafe; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.graphbuilderconf.ForeignCallPlugin; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugin.Receiver; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.replacements.StandardGraphBuilderPlugins.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.AtomicReadAndAddNode; +import com.oracle.graal.nodes.java.AtomicReadAndWriteNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.replacements.IntegerSubstitutions; +import com.oracle.graal.replacements.LongSubstitutions; +import com.oracle.graal.replacements.StandardGraphBuilderPlugins.UnsafeGetPlugin; +import com.oracle.graal.replacements.StandardGraphBuilderPlugins.UnsafePutPlugin; public class AMD64GraphBuilderPlugins {
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,23 @@ */ package com.oracle.graal.replacements.amd64; -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.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.amd64.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.FloatStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.amd64.AMD64ArithmeticLIRGenerator; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo public final class AMD64MathIntrinsicNode extends UnaryNode implements ArithmeticLIRLowerable {
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.replacements.amd64; -import static com.oracle.graal.compiler.target.Backend.*; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_COS; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_POW; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_SIN; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_TAN; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.extended.ForeignCallNode; import com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation; // JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements.sparc/src/com/oracle/graal/replacements/sparc/SPARCGraphBuilderPlugins.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.sparc/src/com/oracle/graal/replacements/sparc/SPARCGraphBuilderPlugins.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,22 @@ */ package com.oracle.graal.replacements.sparc; -import jdk.internal.jvmci.meta.*; -import static com.oracle.graal.compiler.target.Backend.*; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_COS; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_EXP; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_LOG; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_LOG10; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_POW; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_SIN; +import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_TAN; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.spi.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; +import com.oracle.graal.graphbuilderconf.ForeignCallPlugin; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.replacements.*; +import com.oracle.graal.replacements.IntegerSubstitutions; +import com.oracle.graal.replacements.LongSubstitutions; public class SPARCGraphBuilderPlugins {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ArraysSubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ArraysSubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,22 @@ */ package com.oracle.graal.replacements.test; -import java.util.*; +import java.util.Arrays; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.replacements.nodes.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.replacements.ArraysSubstitutions; +import com.oracle.graal.replacements.nodes.ArrayEqualsNode; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; /** * Tests {@link ArraysSubstitutions}.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/BitOpNodesTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/BitOpNodesTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,21 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.replacements.nodes.BitScanReverseNode; public class BitOpNodesTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaTypeProfile; + +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.CheckCastNode; /** * Tests the implementation of checkcast, allowing profiling information to be manually specified.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CompiledExceptionHandlerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CompiledExceptionHandlerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,16 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.nodes.java.ExceptionObjectNode; +import com.oracle.graal.phases.common.AbstractInliningPhase; /** * Tests compilation of a hot exception handler.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,15 @@ */ package com.oracle.graal.replacements.test; -import java.util.*; +import java.util.Random; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.phases.common.AbstractInliningPhase; /** * Tests that deoptimization upon exception handling works.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DerivedOopTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DerivedOopTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,24 @@ */ package com.oracle.graal.replacements.test; -import java.util.*; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; -import com.oracle.graal.word.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.nodes.WordCastNode; /** * Tests for derived oops in reference maps.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DynamicNewArrayTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DynamicNewArrayTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.replacements.test; -import java.lang.reflect.*; +import java.lang.reflect.Array; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests the implementation of Array.createInstance.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,29 @@ */ package com.oracle.graal.replacements.test; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.Edges; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.common.inlining.policy.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.common.inlining.policy.InlineMethodSubstitutionsPolicy; +import com.oracle.graal.phases.tiers.HighTierContext; public class EdgesTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfDynamicTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.java.InstanceOfDynamicNode; /** * Tests for {@link InstanceOfDynamicNode}.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,29 @@ */ package com.oracle.graal.replacements.test; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; -import jdk.internal.jvmci.code.CompilationResult.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.code.CompilationResult.Call; +import jdk.internal.jvmci.code.CompilationResult.Mark; +import jdk.internal.jvmci.code.CompilationResult.Site; +import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.*; - -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.StructuredGraph.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.java.TypeCheckNode; +import com.oracle.graal.phases.common.AbstractInliningPhase; import com.oracle.graal.replacements.test.CheckCastTest.Depth12; import com.oracle.graal.replacements.test.CheckCastTest.Depth13; import com.oracle.graal.replacements.test.CheckCastTest.Depth14;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InvokeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InvokeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.phases.common.AbstractInliningPhase; /** * Tests the implementation of the snippets for lowering the INVOKE* instructions.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MethodSubstitutionTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MethodSubstitutionTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,24 @@ */ package com.oracle.graal.replacements.test; -import java.lang.reflect.*; - -import jdk.internal.jvmci.code.*; +import java.lang.reflect.InvocationTargetException; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.inlining.InliningPhase; +import com.oracle.graal.phases.tiers.HighTierContext; /** * Tests if {@link MethodSubstitution}s are inlined correctly. Most test cases only assert that
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MonitorTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MonitorTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.virtual.phases.ea.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.virtual.phases.ea.PartialEscapePhase; public class MonitorTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewArrayTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewArrayTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.replacements.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests the implementation of {@code [A]NEWARRAY}.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewInstanceTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.replacements.test; -import java.util.*; +import java.util.HashMap; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests the implementation of {@code NEW}.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.graal.replacements.test; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.lang.reflect.InvocationTargetException; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.NewMultiArrayNode; /** * Tests the lowering of the MULTIANEWARRAY instruction.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ObjectAccessTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ObjectAccessTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,29 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.extended.JavaReadNode; +import com.oracle.graal.nodes.extended.JavaWriteNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.replacements.ReplacementsImpl; +import com.oracle.graal.replacements.Snippet; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.ObjectAccess; +import com.oracle.graal.word.Pointer; +import com.oracle.graal.word.Word; /** * Tests for the {@link Pointer} read and write operations.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PEGraphDecoderTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PEGraphDecoderTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,34 @@ */ package com.oracle.graal.replacements.test; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; +import com.oracle.graal.nodes.ValueNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.replacements.CachingPEGraphDecoder; public class PEGraphDecoderTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,33 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; -import com.oracle.graal.word.nodes.*; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.extended.JavaReadNode; +import com.oracle.graal.nodes.extended.JavaWriteNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.replacements.ReplacementsImpl; +import com.oracle.graal.replacements.Snippet; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.Pointer; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.nodes.WordCastNode; /** * Tests for the {@link Pointer} read and write operations.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTrackingTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTrackingTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,22 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugConfigScope; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.Word; public class PointerTrackingTest extends GraalCompilerTest implements Snippets {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ReplacementsParseTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ReplacementsParseTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,21 @@ */ package com.oracle.graal.replacements.test; -import java.util.function.*; +import java.util.function.Function; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.test.GraalCompilerTest; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.runtime.RuntimeProvider; /** * Tests for expected behavior when parsing snippets and intrinsics.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,22 @@ */ package com.oracle.graal.replacements.test; -import java.util.*; +import java.util.HashMap; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; + +import org.junit.Test; -import org.junit.*; - -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.calc.AbsNode; +import com.oracle.graal.nodes.calc.ReinterpretNode; +import com.oracle.graal.replacements.nodes.BitCountNode; +import com.oracle.graal.replacements.nodes.BitScanForwardNode; +import com.oracle.graal.replacements.nodes.BitScanReverseNode; +import com.oracle.graal.replacements.nodes.ReverseBytesNode; /** * Tests the VM independent {@link MethodSubstitution}s.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.nodes.*; -import com.oracle.graal.replacements.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.replacements.StringSubstitutions; +import com.oracle.graal.replacements.nodes.ArrayEqualsNode; /** * Tests {@link StringSubstitutions}.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/SubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/SubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,31 @@ */ package com.oracle.graal.replacements.test; -import static com.oracle.graal.nodeinfo.InputType.*; -import static org.hamcrest.CoreMatchers.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.nodeinfo.InputType.Guard; +import static com.oracle.graal.nodeinfo.InputType.Memory; +import static org.hamcrest.CoreMatchers.instanceOf; +import jdk.internal.jvmci.meta.JavaKind; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodeinfo.StructuralInput.Guard; import com.oracle.graal.nodeinfo.StructuralInput.Memory; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.memory.MemoryNode; public class SubstitutionsTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.JavaTypeProfile.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.TriState; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.StructuredGraph; /** * Base class for checkcast and instanceof test classes.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import sun.misc.*; +import sun.misc.Unsafe; /** * Tests the VM independent intrinsification of {@link Unsafe} methods.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsignedIntegerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsignedIntegerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests the unsigned operations on {@link Integer} and {@link Long}.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsignedMathTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsignedMathTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.UnsignedMath; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests the substitutions for the {@link UnsignedMath} class.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnwindExceptionToCallerTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnwindExceptionToCallerTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; /** * Tests exception throwing from Graal compiled code.
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.replacements.*; -import com.oracle.graal.word.*; +import com.oracle.graal.replacements.ReplacementsImpl; +import com.oracle.graal.replacements.Snippet; +import com.oracle.graal.replacements.Snippets; +import com.oracle.graal.word.Pointer; +import com.oracle.graal.word.Unsigned; +import com.oracle.graal.word.Word; +import com.oracle.graal.word.WordBase; /** * Tests for the {@link Word} type.
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/APHotSpotSignature.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/APHotSpotSignature.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.replacements.verifier; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; /**
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/AbstractVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/AbstractVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.replacements.verifier; -import java.lang.annotation.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; public abstract class AbstractVerifier {
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/ClassSubstitutionVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/ClassSubstitutionVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.replacements.verifier; -import java.lang.annotation.*; +import java.lang.annotation.Annotation; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; -import com.oracle.graal.api.replacements.*; +import com.oracle.graal.api.replacements.ClassSubstitution; public final class ClassSubstitutionVerifier extends AbstractVerifier {
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/MethodSubstitutionVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/MethodSubstitutionVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,28 @@ */ package com.oracle.graal.replacements.verifier; -import java.lang.annotation.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.util.ElementFilter; import javax.tools.Diagnostic.Kind; -import com.oracle.graal.api.replacements.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.MethodSubstitution; public final class MethodSubstitutionVerifier extends AbstractVerifier {
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,31 @@ */ package com.oracle.graal.replacements.verifier; -import java.lang.annotation.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeVariable; +import javax.lang.model.util.ElementFilter; import javax.tools.Diagnostic.Kind; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.InjectedNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodeinfo.StructuralInput.MarkerType; public final class NodeIntrinsicVerifier extends AbstractVerifier {
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/VerifierAnnotationProcessor.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/VerifierAnnotationProcessor.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,20 @@ */ package com.oracle.graal.replacements.verifier; -import java.lang.annotation.*; -import java.util.*; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +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.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.DeclaredType; public class VerifierAnnotationProcessor extends AbstractProcessor {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraySubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraySubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.java.ArrayLengthNode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraysSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraysSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.replacements.nodes.ArrayEqualsNode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,29 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.replacements.SnippetTemplate.*; +import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; +import static com.oracle.graal.compiler.common.GraalOptions.SnippetCounters; +import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; + +import java.util.EnumMap; -import java.util.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.code.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.extended.UnboxNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.util.Providers; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.SnippetInfo;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CachingPEGraphDecoder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CachingPEGraphDecoder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,26 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; - -import java.util.*; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; -import jdk.internal.jvmci.code.*; +import java.util.HashMap; +import java.util.Map; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.EncodedGraph; +import com.oracle.graal.nodes.GraphEncoder; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.phases.util.Providers; /** * A graph decoder that provides all necessary encoded graphs on-the-fly (by parsing the methods and
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ConstantBindingParameterPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ConstantBindingParameterPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.ParameterPlugin; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.calc.FloatingNode; /** * A {@link ParameterPlugin} that binds constant values to some parameters.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,34 +22,104 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.nodes.NamedLocationIdentity.*; -import static com.oracle.graal.nodes.java.ArrayLengthNode.*; -import static jdk.internal.jvmci.code.MemoryBarriers.*; -import static jdk.internal.jvmci.meta.DeoptimizationAction.*; -import static jdk.internal.jvmci.meta.DeoptimizationReason.*; +import static com.oracle.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION; +import static com.oracle.graal.nodes.java.ArrayLengthNode.readArrayLength; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; +import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.internal.jvmci.meta.DeoptimizationReason.BoundsCheckException; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; -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.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ConditionAnchorNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerConvertNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.calc.LeftShiftNode; +import com.oracle.graal.nodes.calc.NarrowNode; +import com.oracle.graal.nodes.calc.PointerEqualsNode; +import com.oracle.graal.nodes.calc.RightShiftNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.SubNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.debug.VerifyHeapNode; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.extended.FixedValueAnchorNode; +import com.oracle.graal.nodes.extended.GuardingNode; +import com.oracle.graal.nodes.extended.JavaReadNode; +import com.oracle.graal.nodes.extended.JavaWriteNode; +import com.oracle.graal.nodes.extended.LoadHubNode; +import com.oracle.graal.nodes.extended.MembarNode; +import com.oracle.graal.nodes.extended.UnboxNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.java.AbstractNewObjectNode; +import com.oracle.graal.nodes.java.AccessIndexedNode; +import com.oracle.graal.nodes.java.ArrayLengthNode; +import com.oracle.graal.nodes.java.AtomicReadAndWriteNode; +import com.oracle.graal.nodes.java.CheckCastDynamicNode; +import com.oracle.graal.nodes.java.CheckCastNode; +import com.oracle.graal.nodes.java.CompareAndSwapNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.java.LoweredAtomicReadAndWriteNode; +import com.oracle.graal.nodes.java.LoweredCompareAndSwapNode; +import com.oracle.graal.nodes.java.MonitorEnterNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.java.NewArrayNode; +import com.oracle.graal.nodes.java.NewInstanceNode; +import com.oracle.graal.nodes.java.RawMonitorEnterNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.java.StoreIndexedNode; +import com.oracle.graal.nodes.java.TypeCheckNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.WriteNode; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.memory.address.RawAddressNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringProvider; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.util.Providers; /** * VM-independent lowerings for standard Java nodes. VM-specific methods are abstract and must be
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraphKit.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraphKit.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,30 +22,52 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +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 com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graph.Graph; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.java.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.java.FrameStateBuilder; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.BeginNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; +import com.oracle.graal.nodes.EndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; import com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.word.*; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.word.WordTypes; /** * A utility for manually creating a graph. This will be expanded as necessary to support all
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InlineDuringParsingPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InlineDuringParsingPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.java.BytecodeParser.Options.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.compiler.common.GraalOptions.TrivialInliningSize; +import static com.oracle.graal.java.BytecodeParser.Options.InlineDuringParsingMaxDepth; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; +import com.oracle.graal.nodes.ValueNode; public final class InlineDuringParsingPlugin implements InlineInvokePlugin {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,21 +22,35 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.nodes.calc.CompareNode.*; +import static com.oracle.graal.nodes.calc.CompareNode.createCompareNode; -import java.util.*; +import java.util.List; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.TargetDescription; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ConditionAnchorNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ShortCircuitOrNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.ClassIsAssignableFromNode; +import com.oracle.graal.nodes.java.InstanceOfDynamicNode; +import com.oracle.graal.nodes.java.InstanceOfNode; +import com.oracle.graal.nodes.java.TypeCheckNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.util.Providers; import com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates; import com.oracle.graal.replacements.SnippetTemplate.Arguments; import com.oracle.graal.replacements.SnippetTemplate.UsageReplacer;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/IntegerSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/IntegerSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.replacements; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.replacements.nodes.BitScanForwardNode; +import com.oracle.graal.replacements.nodes.BitScanReverseNode; public class IntegerSubstitutions {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/IntrinsicGraphBuilder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/IntrinsicGraphBuilder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,35 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +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 com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugin.Receiver; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.StampProvider; /** * Implementation of {@link GraphBuilderContext} used to produce a graph for a method based on an
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Log.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Log.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,14 @@ */ package com.oracle.graal.replacements; -import java.io.*; +import java.io.PrintStream; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.compiler.common.spi.*; +import com.oracle.graal.nodes.extended.ForeignCallNode; //JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/LongSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/LongSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.replacements; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.replacements.nodes.BitScanForwardNode; +import com.oracle.graal.replacements.nodes.BitScanReverseNode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/MethodHandlePlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/MethodHandlePlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,20 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MethodHandleAccessProvider; +import jdk.internal.jvmci.meta.MethodHandleAccessProvider.IntrinsicMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.NodePlugin; +import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.replacements.nodes.MethodHandleNode; public class MethodHandlePlugin implements NodePlugin { private final MethodHandleAccessProvider methodHandleAccess;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,39 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.replacements.NodeIntrinsificationPhase.*; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static com.oracle.graal.replacements.NodeIntrinsificationPhase.COULD_NOT_FOLD; +import static jdk.internal.jvmci.meta.MetaUtil.resolveJavaTypes; + +import java.util.Arrays; +import java.util.List; -import java.util.*; - -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.common.JVMCIError; +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.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.MethodFilter; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.NodePlugin; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.StructuralInput; import com.oracle.graal.nodeinfo.StructuralInput.MarkerType; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.ForeignCallNode; +import com.oracle.graal.nodes.extended.UnsafeCopyNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.word.WordTypes; /** * An {@link NodePlugin} that handles methods annotated by {@link Fold} and {@link NodeIntrinsic}.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/PEGraphDecoder.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/PEGraphDecoder.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,33 +22,72 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.java.BytecodeParser.Options.*; -import static jdk.internal.jvmci.common.JVMCIError.*; +import static com.oracle.graal.java.BytecodeParser.Options.DumpDuringGraphBuilding; +import static com.oracle.graal.java.BytecodeParser.Options.FailedLoopExplosionIsFatal; +import static com.oracle.graal.java.BytecodeParser.Options.MaximumLoopExplosionCount; +import static jdk.internal.jvmci.common.JVMCIError.unimplemented; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.debug.*; - -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.code.Architecture; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.BytecodePosition; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; import com.oracle.graal.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver; -import com.oracle.graal.java.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graphbuilderconf.LoopExplosionPlugin; +import com.oracle.graal.graphbuilderconf.ParameterPlugin; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.EncodedGraph; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeWithExceptionNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.SimpleInfopointNode; +import com.oracle.graal.nodes.SimplifyingGraphDecoder; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.UnwindNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.IntegerSwitchNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.spi.StampProvider; import com.oracle.graal.nodes.util.GraphUtil; -import com.oracle.graal.phases.common.inlining.*; +import com.oracle.graal.phases.common.inlining.InliningUtil; /** * A graph decoder that performs partial evaluation, i.e., that performs method inlining and
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,46 +22,82 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.*; -import static com.oracle.graal.java.BytecodeParser.Options.*; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; -import static java.lang.String.*; -import static jdk.internal.jvmci.meta.MetaUtil.*; +import static com.oracle.graal.compiler.common.GraalOptions.DeoptALot; +import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; +import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; +import static com.oracle.graal.java.BytecodeParser.Options.InlineDuringParsing; +import static com.oracle.graal.java.BytecodeParser.Options.InlineIntrinsicsDuringParsing; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; +import static java.lang.String.format; +import static jdk.internal.jvmci.meta.MetaUtil.toInternalName; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Executable; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicReference; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.code.TargetDescription; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +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.options.OptionValue; +import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import sun.misc.Launcher; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import jdk.internal.jvmci.options.OptionValue.*; -import sun.misc.*; - -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.graph.*; +import com.oracle.graal.api.replacements.ClassSubstitution; +import com.oracle.graal.api.replacements.Fold; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.api.replacements.SnippetTemplateCache; +import com.oracle.graal.api.replacements.SubstitutionGuard; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.graph.Node; import com.oracle.graal.graph.Node.NodeIntrinsic; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.java.*; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; +import com.oracle.graal.graphbuilderconf.IntrinsicContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; +import com.oracle.graal.graphbuilderconf.MethodSubstitutionPlugin; +import com.oracle.graal.java.GraphBuilderPhase; import com.oracle.graal.java.GraphBuilderPhase.Instance; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.Replacements; +import com.oracle.graal.nodes.spi.StampProvider; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.ConvertDeoptimizeToGuardPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.word.Word; public class ReplacementsImpl implements Replacements, InlineInvokePlugin {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.compiler.common.GraalOptions; +import com.oracle.graal.replacements.nodes.AssertionNode; // JaCoCo Exclude public final class ReplacementsUtil {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Snippet.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Snippet.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,12 @@ */ package com.oracle.graal.replacements; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.replacements.nodes.ExplodeLoopNode; /** * A snippet is a Graal graph expressed as a Java source method. Snippets are used for lowering
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetCounter.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetCounter.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,8 +24,10 @@ //JaCoCo Exclude -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * A counter that can be safely {@linkplain #inc() incremented} from within a snippet for gathering
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,49 +22,108 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.debug.Debug.*; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; -import static com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates.*; -import static java.util.FormattableFlags.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static com.oracle.graal.debug.Debug.applyFormattingFlagsAndWidth; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; +import static com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates.UseSnippetTemplateCache; +import static java.util.FormattableFlags.ALTERNATE; +import static jdk.internal.jvmci.meta.LocationIdentity.any; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; -import java.util.function.*; -import java.util.stream.*; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Formattable; +import java.util.Formatter; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +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.JavaKind; +import jdk.internal.jvmci.meta.Local; +import jdk.internal.jvmci.meta.LocationIdentity; +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.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.debug.TTY; import com.oracle.graal.graph.Graph.Mark; -import com.oracle.graal.graph.*; import com.oracle.graal.graph.Node; -import com.oracle.graal.loop.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.Position; +import com.oracle.graal.loop.LoopEx; +import com.oracle.graal.loop.LoopTransformations; +import com.oracle.graal.loop.LoopsData; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.MergeNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ReturnNode; +import com.oracle.graal.nodes.StartNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; import com.oracle.graal.nodes.StructuredGraph.GuardsStage; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValueNodeUtil; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.java.StoreIndexedNode; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryAnchorNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryMap; +import com.oracle.graal.nodes.memory.MemoryMapNode; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.memory.MemoryPhiNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.MemoryProxy; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.FloatingReadPhase; import com.oracle.graal.phases.common.FloatingReadPhase.MemoryMapImpl; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.phases.util.Providers; import com.oracle.graal.replacements.Snippet.ConstantParameter; import com.oracle.graal.replacements.Snippet.VarargsParameter; -import com.oracle.graal.replacements.nodes.*; -import com.oracle.graal.word.*; +import com.oracle.graal.replacements.nodes.ExplodeLoopNode; +import com.oracle.graal.replacements.nodes.LoadSnippetVarargParameterNode; +import com.oracle.graal.word.WordBase; /** * A snippet template is a graph created by parsing a snippet method and then specialized by binding
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,33 +22,89 @@ */ package com.oracle.graal.replacements; -import static jdk.internal.jvmci.code.MemoryBarriers.*; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; +import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.util.Arrays; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.options.*; -import sun.misc.*; +import jdk.internal.jvmci.code.UnsignedMath; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +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.options.Option; +import jdk.internal.jvmci.options.OptionValue; +import sun.misc.Unsafe; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Edges; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeList; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugin.Receiver; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.replacements.nodes.*; -import com.oracle.graal.replacements.nodes.arithmetic.*; +import com.oracle.graal.graphbuilderconf.MethodSubstitutionPlugin; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.FixedGuardNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AbsNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.IsNullNode; +import com.oracle.graal.nodes.calc.NarrowNode; +import com.oracle.graal.nodes.calc.ReinterpretNode; +import com.oracle.graal.nodes.calc.RightShiftNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.SqrtNode; +import com.oracle.graal.nodes.calc.UnsignedDivNode; +import com.oracle.graal.nodes.calc.UnsignedRemNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.debug.BlackholeNode; +import com.oracle.graal.nodes.debug.ControlFlowAnchorNode; +import com.oracle.graal.nodes.debug.OpaqueNode; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.extended.BranchProbabilityNode; +import com.oracle.graal.nodes.extended.GetClassNode; +import com.oracle.graal.nodes.extended.MembarNode; +import com.oracle.graal.nodes.extended.UnboxNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.java.ClassIsAssignableFromNode; +import com.oracle.graal.nodes.java.CompareAndSwapNode; +import com.oracle.graal.nodes.java.DynamicNewArrayNode; +import com.oracle.graal.nodes.java.DynamicNewInstanceNode; +import com.oracle.graal.nodes.java.InstanceOfDynamicNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.RegisterFinalizerNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.EnsureVirtualizedNode; +import com.oracle.graal.replacements.nodes.BitCountNode; +import com.oracle.graal.replacements.nodes.DeferredPiNode; +import com.oracle.graal.replacements.nodes.DirectReadNode; +import com.oracle.graal.replacements.nodes.DirectStoreNode; +import com.oracle.graal.replacements.nodes.ReverseBytesNode; +import com.oracle.graal.replacements.nodes.VirtualizableInvokeMacroNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerAddExactNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerMulExactNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerSubExactNode; /** * Provides non-runtime specific {@link InvocationPlugin}s.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StringSubstitutions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.replacements.nodes.*; +import com.oracle.graal.compiler.common.SuppressFBWarnings; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.replacements.nodes.ArrayEqualsNode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/WordOperationPlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/WordOperationPlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,29 +22,55 @@ */ package com.oracle.graal.replacements; -import static com.oracle.graal.nodes.ConstantNode.*; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static com.oracle.graal.nodes.ConstantNode.forInt; +import static com.oracle.graal.nodes.ConstantNode.forIntegerKind; +import static jdk.internal.jvmci.meta.LocationIdentity.any; + +import java.lang.reflect.Constructor; -import java.lang.reflect.*; - -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.JavaTypeProfile; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; +import com.oracle.graal.graphbuilderconf.NodePlugin; +import com.oracle.graal.graphbuilderconf.ParameterPlugin; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.calc.ConditionalNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.calc.IntegerBelowNode; +import com.oracle.graal.nodes.calc.IntegerEqualsNode; +import com.oracle.graal.nodes.calc.IntegerLessThanNode; +import com.oracle.graal.nodes.calc.NarrowNode; +import com.oracle.graal.nodes.calc.SignExtendNode; +import com.oracle.graal.nodes.calc.XorNode; +import com.oracle.graal.nodes.calc.ZeroExtendNode; +import com.oracle.graal.nodes.extended.JavaReadNode; +import com.oracle.graal.nodes.extended.JavaWriteNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.java.StoreIndexedNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.word.*; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.word.Word; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation; -import com.oracle.graal.word.nodes.*; +import com.oracle.graal.word.WordTypes; +import com.oracle.graal.word.nodes.WordCastNode; /** * A plugin for calls to {@linkplain Operation word operations}, as well as all other nodes that
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,30 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValueNodeUtil; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; // JaCoCo Exclude
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,20 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Assertion nodes will go away as soon as the value evaluates to true. Compile-time assertions will
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicArrayCopyNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicArrayCopyNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,33 @@ */ package com.oracle.graal.replacements.nodes; -import static jdk.internal.jvmci.meta.LocationIdentity.*; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizingNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.memory.AbstractMemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryAccess; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.MemoryNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; @NodeInfo public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virtualizable, MemoryCheckpoint.Single, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,31 @@ */ package com.oracle.graal.replacements.nodes; -import java.util.*; +import java.util.Collections; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +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 com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.spi.ArrayLengthProvider; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; @NodeInfo public abstract class BasicObjectCloneNode extends MacroStateSplitNode implements VirtualizableAllocation, ArrayLengthProvider {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class BitCountNode extends UnaryNode implements LIRLowerable {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Determines the index of the least significant "1" bit. Note that the result is undefined if the
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.PrimitiveStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Determines the index of the most significant "1" bit. Note that the result is undefined if the
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DeferredPiNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DeferredPiNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -24,15 +24,19 @@ //JaCoCo Exclude -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.replacements.NodeIntrinsificationPhase; /** * A node for use in method substitutions or snippets that changes the type of its input where the
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,24 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.extended.JavaWriteNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.memory.address.AddressNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; /** * A special purpose store node that differs from {@link UnsafeStoreNode} in that it is not a
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * A special purpose store node that differs from {@link UnsafeStoreNode} in that it is not a
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,19 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * A special purpose store node that differs from {@link UnsafeStoreNode} in that it is not a
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ExplodeLoopNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ExplodeLoopNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.replacements.nodes; -import java.util.*; +import java.util.ArrayList; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopBeginNode; import com.oracle.graal.replacements.Snippet.VarargsParameter; /**
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/LoadSnippetVarargParameterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/LoadSnippetVarargParameterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,16 @@ */ package com.oracle.graal.replacements.nodes; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ParameterNode; +import com.oracle.graal.nodes.ValueNode; import com.oracle.graal.replacements.Snippet.VarargsParameter; /**
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,27 +22,39 @@ */ package com.oracle.graal.replacements.nodes; -import static jdk.internal.jvmci.code.BytecodeFrame.*; -import jdk.internal.jvmci.common.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; +import static jdk.internal.jvmci.code.BytecodeFrame.isPlaceholderBci; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.api.replacements.MethodSubstitution; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.GuardsStage; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.replacements.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.FrameStateAssignmentPhase; +import com.oracle.graal.phases.common.GuardLoweringPhase; +import com.oracle.graal.phases.common.LoweringPhase; +import com.oracle.graal.phases.common.RemoveValueProxyPhase; +import com.oracle.graal.phases.common.inlining.InliningUtil; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.replacements.Snippet; /** * Macro nodes can be used to temporarily replace an invoke. They can, for example, be used to
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,24 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BytecodeFrame; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; /** * This is an extension of {@link MacroNode} that is a {@link StateSplit} and a
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MethodHandleNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MethodHandleNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,34 @@ */ package com.oracle.graal.replacements.nodes; -import java.lang.invoke.*; -import java.util.*; +import java.lang.invoke.MethodHandle; +import java.util.Arrays; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.meta.Assumptions.*; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider.*; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.Assumptions; +import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MethodHandleAccessProvider; +import jdk.internal.jvmci.meta.MethodHandleAccessProvider.IntrinsicMethod; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.graph.spi.SimplifierTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * Node for invocation methods defined on the class {@link MethodHandle}.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,19 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; /** * This node class can be used to create {@link MacroNode}s for simple pure functions like
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Access the value of a specific register.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,25 @@ */ package com.oracle.graal.replacements.nodes; -import static sun.misc.Version.*; +import static sun.misc.Version.jdkMajorVersion; +import static sun.misc.Version.jdkMicroVersion; +import static sun.misc.Version.jdkMinorVersion; +import static sun.misc.Version.jdkUpdateVersion; -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.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * A call target that replaces itself in the graph when being lowered by restoring the original
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.UnaryNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class ReverseBytesNode extends UnaryNode implements LIRLowerable {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/VirtualizableInvokeMacroNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/VirtualizableInvokeMacroNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * A helper class to allow elimination of byte code instrumentation that could interfere with escape
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.Register; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodeinfo.Verbosity; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; /** * Changes the value of a specific register.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,24 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.meta.*; +import static com.oracle.graal.compiler.common.type.IntegerStamp.addOverflowsNegatively; +import static com.oracle.graal.compiler.common.type.IntegerStamp.addOverflowsPositively; +import static com.oracle.graal.compiler.common.type.IntegerStamp.carryBits; +import jdk.internal.jvmci.code.CodeUtil; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; - -import static com.oracle.graal.compiler.common.type.IntegerStamp.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.AddNode; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Node representing an exact integer addition that will throw an {@link ArithmeticException} in
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class IntegerAddExactSplitNode extends IntegerExactArithmeticSplitNode {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.spi.Lowerable; interface IntegerExactArithmeticNode extends Lowerable {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,25 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.ControlSplitNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public abstract class IntegerExactArithmeticSplitNode extends ControlSplitNode implements LIRLowerable {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.MulNode; +import com.oracle.graal.nodes.spi.LoweringTool; /** * Node representing an exact integer multiplication that will throw an {@link ArithmeticException}
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class IntegerMulExactSplitNode extends IntegerExactArithmeticSplitNode {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulHighNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulHighNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import java.util.function.*; +import java.util.function.BiFunction; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.BinaryNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "*H") public final class IntegerMulHighNode extends BinaryNode implements ArithmeticLIRLowerable {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,19 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.SubNode; +import com.oracle.graal.nodes.spi.LoweringTool; +import com.oracle.graal.nodes.util.GraphUtil; /** * Node representing an exact integer substraction that will throw an {@link ArithmeticException} in
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractBeginNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class IntegerSubExactSplitNode extends IntegerExactArithmeticSplitNode {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,18 +22,22 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import java.util.function.*; +import java.util.function.BiFunction; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.lir.gen.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.IntegerStamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.lir.gen.ArithmeticLIRGenerator; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.BinaryNode; +import com.oracle.graal.nodes.spi.ArithmeticLIRLowerable; +import com.oracle.graal.nodes.spi.NodeValueMap; @NodeInfo(shortName = "|*H|") public final class UnsignedMulHighNode extends BinaryNode implements ArithmeticLIRLowerable {
--- a/graal/com.oracle.graal.runtime/src/com/oracle/graal/runtime/RuntimeProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.runtime/src/com/oracle/graal/runtime/RuntimeProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.runtime; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.Architecture; -import com.oracle.graal.compiler.target.*; +import com.oracle.graal.compiler.target.Backend; /** * A runtime supporting a host backend as well, zero or more additional backends.
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.test; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Arrays; -import org.junit.*; -import org.junit.internal.*; +import org.junit.Assert; +import org.junit.internal.ComparisonCriteria; +import org.junit.internal.ExactComparisonCriteria; import sun.misc.Unsafe;
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64RawNativeCallNodeFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64RawNativeCallNodeFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,14 @@ */ package com.oracle.graal.truffle.hotspot.amd64; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.service.ServiceProvider; -import com.oracle.graal.hotspot.amd64.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.hotspot.nfi.*; +import com.oracle.graal.hotspot.amd64.AMD64RawNativeCallNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.truffle.hotspot.nfi.RawNativeCallNodeFactory; @ServiceProvider(RawNativeCallNodeFactory.class) public class AMD64RawNativeCallNodeFactory implements RawNativeCallNodeFactory {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntimeAccess.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntimeAccess.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle.hotspot; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.ServiceProvider; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.TruffleRuntimeAccess; @ServiceProvider(TruffleRuntimeAccess.class) public class HotSpotTruffleRuntimeAccess implements TruffleRuntimeAccess {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionHandle.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionHandle.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,16 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import java.util.*; - -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; +import java.util.Arrays; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.*; - -import com.oracle.nfi.api.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.nfi.api.NativeFunctionHandle; public class HotSpotNativeFunctionHandle implements NativeFunctionHandle {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterfaceAccess.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterfaceAccess.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.ServiceProvider; -import com.oracle.graal.truffle.hotspot.*; -import com.oracle.nfi.api.*; +import com.oracle.graal.truffle.hotspot.HotSpotTruffleRuntime; +import com.oracle.nfi.api.NativeFunctionInterface; +import com.oracle.nfi.api.NativeFunctionInterfaceAccess; @ServiceProvider(NativeFunctionInterfaceAccess.class) public class HotSpotNativeFunctionInterfaceAccess implements NativeFunctionInterfaceAccess {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionPointer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionPointer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import com.oracle.nfi.api.*; +import com.oracle.nfi.api.NativeFunctionPointer; public class HotSpotNativeFunctionPointer implements NativeFunctionPointer {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeLibraryHandle.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeLibraryHandle.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import com.oracle.nfi.api.*; +import com.oracle.nfi.api.NativeLibraryHandle; public class HotSpotNativeLibraryHandle implements NativeLibraryHandle {
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/RawNativeCallNodeFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/RawNativeCallNodeFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; /** * Factory for creating a node that makes a direct call to a native function pointer.
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/AssumptionPartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/AssumptionPartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.truffle.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.truffle.*; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.AssumptionCutsBranchTestNode; +import com.oracle.graal.truffle.test.nodes.ConstantWithAssumptionTestNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; public class AssumptionPartialEvaluationTest extends PartialEvaluationTest { public static Object constant42() {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,24 @@ */ package com.oracle.graal.truffle.test; -import java.util.*; +import java.util.Random; -import org.junit.*; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.FrameUtil; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.RootNode; public class BytecodeInterpreterPartialEvaluationTest extends PartialEvaluationTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/CompilerAssertsTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/CompilerAssertsTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.truffle.test; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.ConstantTestNode; +import com.oracle.graal.truffle.test.nodes.NonConstantTestNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; public class CompilerAssertsTest extends PartialEvaluationTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,20 @@ */ package com.oracle.graal.truffle.test; -import org.junit.*; +import org.junit.Assume; +import org.junit.Test; -import com.oracle.graal.truffle.*; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.truffle.TruffleCompilerOptions; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.ControlFlowException; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.SlowPathException; public class ControlFlowExceptionPartialEvaluationTest extends PartialEvaluationTest { public static Object constant42() {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ExactMathTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ExactMathTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.truffle.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.truffle.substitutions.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; +import com.oracle.graal.truffle.substitutions.TruffleGraphBuilderPlugins; +import com.oracle.truffle.api.ExactMath; public class ExactMathTest extends GraalCompilerTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/InstrumentationPartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,25 @@ */ package com.oracle.graal.truffle.test; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.instrument.impl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.ConstantTestNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.ASTProber; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRoot; +import com.oracle.truffle.api.instrument.AdvancedInstrumentRootFactory; +import com.oracle.truffle.api.instrument.Instrument; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.impl.DefaultSimpleInstrumentListener; +import com.oracle.truffle.api.instrument.impl.DefaultStandardInstrumentListener; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeVisitor; /** * Tests for a single simple PE test with various combinations of instrumentation attached. None of
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,26 @@ */ package com.oracle.graal.truffle.test; -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import org.junit.*; +import org.junit.Assert; -import com.oracle.graal.compiler.test.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.test.GraalCompilerTest; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugDumpScope; +import com.oracle.graal.debug.DebugEnvironment; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.tiers.PhaseContext; +import com.oracle.graal.truffle.DefaultTruffleCompiler; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.TruffleCompiler; +import com.oracle.graal.truffle.TruffleDebugJavaMethod; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.nodes.RootNode; public class PartialEvaluationTest extends GraalCompilerTest { private final TruffleCompiler truffleCompiler;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ReadOnlyArrayListPartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ReadOnlyArrayListPartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.truffle.test; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.ReadOnlyArrayListConstantNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.truffle.api.frame.FrameDescriptor; public class ReadOnlyArrayListPartialEvaluationTest extends PartialEvaluationTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/SLTruffleGraalTestSuite.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/SLTruffleGraalTestSuite.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,24 @@ */ package com.oracle.graal.truffle.test; -import org.junit.*; -import org.junit.runner.*; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; -import com.oracle.graal.truffle.test.builtins.*; -import com.oracle.truffle.sl.test.*; +import com.oracle.graal.truffle.test.builtins.SLCallFunctionsWithBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLCallUntilOptimizedBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLDeoptimizeWhenCompiledBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLDisableSplittingBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLGenerateDummyNodesBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLGetOptionBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLIsCompilationConstantBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLIsInlinedBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLIsOptimizedBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLSetOptionBuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLTestTruffleBoundary01BuiltinFactory; +import com.oracle.graal.truffle.test.builtins.SLWaitForOptimizationBuiltinFactory; +import com.oracle.truffle.sl.test.SLTestRunner; +import com.oracle.truffle.sl.test.SLTestSuite; @RunWith(SLTestRunner.class) @SLTestSuite({"graal/com.oracle.graal.truffle.test/sl", "sl"})
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/SimplePartialEvaluationTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/SimplePartialEvaluationTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,31 @@ */ package com.oracle.graal.truffle.test; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.SourceStackTrace; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.replacements.*; -import com.oracle.graal.truffle.*; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.replacements.PEGraphDecoder; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.AddTestNode; +import com.oracle.graal.truffle.test.nodes.BlockTestNode; +import com.oracle.graal.truffle.test.nodes.ConstantTestNode; +import com.oracle.graal.truffle.test.nodes.LambdaTestNode; +import com.oracle.graal.truffle.test.nodes.LoadLocalTestNode; +import com.oracle.graal.truffle.test.nodes.LoopTestNode; +import com.oracle.graal.truffle.test.nodes.NestedExplodedLoopTestNode; +import com.oracle.graal.truffle.test.nodes.NeverPartOfCompilationTestNode; +import com.oracle.graal.truffle.test.nodes.ObjectEqualsNode; +import com.oracle.graal.truffle.test.nodes.RecursionTestNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.graal.truffle.test.nodes.StoreLocalTestNode; +import com.oracle.graal.truffle.test.nodes.StringEqualsNode; +import com.oracle.graal.truffle.test.nodes.TwoMergesExplodedLoopTestNode; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.nodes.RootNode; public class SimplePartialEvaluationTest extends PartialEvaluationTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleDirectCallNodeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleDirectCallNodeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.truffle.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; -import org.junit.*; +import org.junit.Test; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.RootNode; public class TruffleDirectCallNodeTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleEnsureVirtualizedTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleEnsureVirtualizedTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.truffle.test; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -import com.oracle.graal.api.directives.*; -import com.oracle.graal.truffle.test.nodes.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.graal.api.directives.GraalDirectives; +import com.oracle.graal.truffle.test.nodes.AbstractTestNode; +import com.oracle.graal.truffle.test.nodes.RootTestNode; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; public class TruffleEnsureVirtualizedTest extends PartialEvaluationTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleRuntimeTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleRuntimeTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.truffle.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -import org.junit.*; +import org.junit.Test; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.runtime.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.impl.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.runtime.RuntimeProvider; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.impl.DefaultTruffleRuntime; public class TruffleRuntimeTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleStampTest.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleStampTest.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.truffle.test; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.sameInstance; +import static org.junit.Assert.assertThat; -import org.junit.*; -import org.junit.experimental.theories.*; -import org.junit.runner.*; +import org.junit.Before; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.truffle.DefaultTruffleStamp; +import com.oracle.graal.truffle.TruffleStamp; +import com.oracle.truffle.api.TypedObject; @RunWith(Theories.class) public class TruffleStampTest {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,19 @@ */ package com.oracle.graal.truffle.test.builtins; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.source.Source; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.SLAssertionError; +import com.oracle.truffle.sl.SLLanguage; +import com.oracle.truffle.sl.runtime.SLContext; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLNull; /** * Returns all functions that start with test.
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.truffle.test.builtins; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.SLAssertionError; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLNull; /** * Calls a given function until the Graal runtime decides to optimize the function. Use
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.truffle.test.builtins; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.runtime.SLNull; /** * Forces a deoptimization as soon as the method runs in compiled code.
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,15 @@ */ package com.oracle.graal.truffle.test.builtins; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.OptimizedCallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLNull; /** * Disables splitting for a given {@link SLFunction} instance. If no function is given the splitting
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGenerateDummyNodesBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGenerateDummyNodesBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.truffle.test.builtins; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.nodes.SLExpressionNode; +import com.oracle.truffle.sl.nodes.SLRootNode; +import com.oracle.truffle.sl.runtime.SLNull; /** * Generates a given number of dummy nodes and replaces the root of the current method with them.
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGetOptionBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGetOptionBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.truffle.test.builtins; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.OptionDescriptor; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.TruffleCompilerOptions; +import com.oracle.graal.truffle.TruffleCompilerOptions_OptionDescriptors; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; /** * Looks up the value of an option in {@link TruffleCompilerOptions}. In the future this builtin
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.graal.truffle.test.builtins; -import java.util.*; +import java.util.HashSet; +import java.util.Set; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.source.*; -import com.oracle.truffle.sl.builtins.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeVisitor; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.source.SourceSection; +import com.oracle.truffle.sl.builtins.SLBuiltinNode; +import com.oracle.truffle.sl.runtime.SLContext; public abstract class SLGraalRuntimeBuiltin extends SLBuiltinNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.truffle.test.builtins; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; /** * Checks whether or not a function is optimized by the Graal runtime.
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLIsInlinedBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLIsInlinedBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.truffle.test.builtins; -import java.util.*; +import java.util.List; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.OptimizedDirectCallNode; +import com.oracle.graal.truffle.TruffleInlining; import com.oracle.graal.truffle.TruffleInlining.CallTreeNodeVisitor; +import com.oracle.graal.truffle.TruffleInliningDecision; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.runtime.SLFunction; /** * Returns <code>true</code> if a function got inlined for all calls from a given {@link SLFunction}
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,11 @@ */ package com.oracle.graal.truffle.test.builtins; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.OptimizedCallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.runtime.SLFunction; /** * Checks whether or not a function is optimized by the Graal runtime.
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLSetOptionBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLSetOptionBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.truffle.test.builtins; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.OptionDescriptor; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.TruffleCompilerOptions; +import com.oracle.graal.truffle.TruffleCompilerOptions_OptionDescriptors; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; /** * Sets an option value in {@link TruffleCompilerOptions}. In the future this builtin might be
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.truffle.test.builtins; -import java.util.concurrent.*; +import java.util.concurrent.Callable; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.runtime.SLNull; /** * Just used in TestTruffleBoundary01.sl. Verifies that all intrinsics have no effect inside of a @TruffleBoundary
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,16 @@ */ package com.oracle.graal.truffle.test.builtins; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.sl.runtime.*; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.dsl.Specialization; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.sl.runtime.SLFunction; +import com.oracle.truffle.sl.runtime.SLNull; /** * Waits for the optimization of a function to complete if it was already triggered. If no
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AbstractTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AbstractTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; public abstract class AbstractTestNode extends Node {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AddTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AddTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; public class AddTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class AssumptionCutsBranchTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/BlockTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/BlockTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class BlockTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; public class ConstantTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class ConstantWithAssumptionTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LambdaTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LambdaTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.truffle.test.nodes; -import java.util.function.*; +import java.util.function.Supplier; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; public class LambdaTestNode extends AbstractTestNode { @Override
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoadLocalTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoadLocalTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.VirtualFrame; public class LoadLocalTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoopTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoopTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; public class LoopTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/NestedExplodedLoopTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/NestedExplodedLoopTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,9 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class NestedExplodedLoopTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.frame.VirtualFrame; public class NeverPartOfCompilationTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/NonConstantTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/NonConstantTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.VirtualFrame; public class NonConstantTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ObjectEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ObjectEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,8 +23,8 @@ package com.oracle.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class ObjectEqualsNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ReadOnlyArrayListConstantNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ReadOnlyArrayListConstantNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import java.util.List; + +import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.impl.ReadOnlyArrayList; -import java.util.List; public class ReadOnlyArrayListConstantNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/RecursionTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/RecursionTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,8 +22,8 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class RecursionTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/RootTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/RootTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,9 +23,11 @@ package com.oracle.graal.truffle.test.nodes; import com.oracle.graal.truffle.test.MockLanguage; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.nodes.NodeInfo; +import com.oracle.truffle.api.nodes.RootNode; @NodeInfo public class RootTestNode extends RootNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StoreLocalTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StoreLocalTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.VirtualFrame; public class StoreLocalTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StringEqualsNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StringEqualsNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -23,8 +23,8 @@ package com.oracle.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class StringEqualsNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/TwoMergesExplodedLoopTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/TwoMergesExplodedLoopTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.oracle.truffle.api.nodes.NodeInfo; @NodeInfo public class TwoMergesExplodedLoopTestNode extends AbstractTestNode {
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/WrapperTestNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/WrapperTestNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.truffle.test.nodes; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.instrument.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.instrument.KillException; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeNode; import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; /** * Support for PE testing instrumentation.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public interface CompilationPolicy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationProfile.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationProfile.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,13 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCompilationThreshold; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleInvalidationReprofileCount; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleMinInvokeThreshold; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleReplaceReprofileCount; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; public class CompilationProfile {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CounterAndTimeBasedCompilationPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CounterAndTimeBasedCompilationPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleTimeThreshold; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public class CounterAndTimeBasedCompilationPolicy extends CounterBasedCompilationPolicy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CounterBasedCompilationPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CounterBasedCompilationPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public class CounterBasedCompilationPolicy implements CompilationPolicy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultInliningPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultInliningPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleInliningMaxCallerSize; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleMaximumRecursiveInlining; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public class DefaultInliningPolicy implements TruffleInliningPolicy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultLoopNodeFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultLoopNodeFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.service.*; +import jdk.internal.jvmci.service.ServiceProvider; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.RepeatingNode; @ServiceProvider(LoopNodeFactory.class) public class DefaultLoopNodeFactory implements LoopNodeFactory {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleCompiler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleCompiler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,19 @@ */ package com.oracle.graal.truffle; -import java.util.*; +import java.util.ListIterator; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.target.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.target.Backend; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.java.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.runtime.*; +import com.oracle.graal.java.GraphBuilderPhase; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.runtime.RuntimeProvider; public final class DefaultTruffleCompiler extends TruffleCompiler {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeUtil; import com.oracle.truffle.api.nodes.NodeUtil.NodeCountFilter; public class DefaultTruffleSplittingStrategy implements TruffleSplittingStrategy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,11 @@ */ package com.oracle.graal.truffle; -import java.util.*; +import java.util.Map; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeVisitor; public class DefaultTruffleSplittingStrategyNew implements TruffleSplittingStrategy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleStamp.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleStamp.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.truffle; -import java.util.*; +import java.util.Arrays; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.TypedObject; +import com.oracle.truffle.api.nodes.NodeInfo; public final class DefaultTruffleStamp {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithBoxing.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithBoxing.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.graal.truffle; -import java.util.*; +import java.util.Arrays; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; /** * More efficient implementation of the Truffle frame that has no safety checks for frame accesses
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.truffle; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Field; +import java.util.Arrays; + +import sun.misc.Unsafe; -import sun.misc.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; /** * More efficient implementation of the Truffle frame that has no safety checks for frame accesses
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalCompilerOptions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalCompilerOptions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.impl.*; +import com.oracle.truffle.api.impl.DefaultCompilerOptions; public class GraalCompilerOptions extends DefaultCompilerOptions {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalFrameInstance.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalFrameInstance.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,19 @@ */ package com.oracle.graal.truffle; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import jdk.internal.jvmci.code.stack.*; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.code.stack.InspectedFrame; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.Node; public abstract class GraalFrameInstance implements FrameInstance {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CompilationResult; -import com.oracle.graal.nodes.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.truffle.api.nodes.Node; /** * Enables implementations of this interface to listen to compilation related events of the Graal
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,54 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; - -import java.util.*; -import java.util.concurrent.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCompileOnly; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleEnableInfopoints; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.stack.*; -import jdk.internal.jvmci.meta.*; -import jdk.internal.jvmci.service.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; + +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.stack.InspectedFrame; +import jdk.internal.jvmci.code.stack.InspectedFrameVisitor; +import jdk.internal.jvmci.code.stack.StackIntrospection; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.service.Services; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.debug.*; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.debug.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.debug.CompilationStatisticsListener; +import com.oracle.graal.truffle.debug.PrintCallTargetProfiling; +import com.oracle.graal.truffle.debug.TraceCompilationCallTreeListener; +import com.oracle.graal.truffle.debug.TraceCompilationFailureListener; +import com.oracle.graal.truffle.debug.TraceCompilationListener; +import com.oracle.graal.truffle.debug.TraceCompilationPolymorphismListener; +import com.oracle.graal.truffle.debug.TraceInliningListener; +import com.oracle.graal.truffle.debug.TracePerformanceWarningsListener; +import com.oracle.graal.truffle.debug.TraceSplittingListener; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerOptions; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.TruffleRuntime; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameInstance; +import com.oracle.truffle.api.frame.FrameInstanceVisitor; +import com.oracle.truffle.api.frame.MaterializedFrame; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RepeatingNode; +import com.oracle.truffle.api.nodes.RootNode; public abstract class GraalTruffleRuntime implements TruffleRuntime {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/InterpreterOnlyCompilationPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/InterpreterOnlyCompilationPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public class InterpreterOnlyCompilationPolicy implements CompilationPolicy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/LoopNodeFactory.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/LoopNodeFactory.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.RepeatingNode; public interface LoopNodeFactory extends PrioritizedServiceProvider {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedAssumption.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedAssumption.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,20 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleAssumptions; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleStackTraceLimit; -import java.lang.ref.*; -import java.util.*; -import java.util.stream.*; +import java.lang.ref.WeakReference; +import java.util.Arrays; +import java.util.stream.Collectors; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.InstalledCode; -import com.oracle.graal.debug.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.debug.TTY; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.impl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.impl.AbstractAssumption; +import com.oracle.truffle.api.nodes.InvalidAssumptionException; public final class OptimizedAssumption extends AbstractAssumption {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,26 +22,54 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleArgumentTypeSpeculation; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleBackgroundCompilation; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCallTargetProfiling; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCompilationExceptionsAreFatal; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCompilationExceptionsAreThrown; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleReturnTypeSpeculation; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.atomic.*; -import java.util.stream.*; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Spliterators; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.common.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.BailoutException; +import jdk.internal.jvmci.code.InstalledCode; +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.SpeculationLog; -import com.oracle.graal.truffle.debug.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.truffle.debug.AbstractDebugCompilationListener; +import com.oracle.truffle.api.Assumption; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.impl.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerOptions; +import com.oracle.truffle.api.ExecutionContext; +import com.oracle.truffle.api.LoopCountReceiver; +import com.oracle.truffle.api.OptimizationFailedException; +import com.oracle.truffle.api.ReplaceObserver; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.impl.DefaultCompilerOptions; +import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; -import com.oracle.truffle.api.utilities.*; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.NodeVisitor; +import com.oracle.truffle.api.nodes.RootNode; +import com.oracle.truffle.api.utilities.CyclicAssumption; +import com.oracle.truffle.api.utilities.ValueProfile; /** * Call target that is optimized by Graal upon surpassing a specific invocation threshold.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedDirectCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedDirectCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,14 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.FrameInstance.FrameAccess; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.NodeInfo; /** * A call node with a constant {@link CallTarget} that can be optimized by Graal.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedIndirectCallNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedIndirectCallNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.FrameInstance.FrameAccess; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.NodeInfo; /** * A call node with a constant {@link CallTarget} that can be optimized by Graal.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedLoopNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedLoopNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.RepeatingNode; /** * Temporary node for legacy loop count reporting support as it was most likely done in other
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedOSRLoopNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedOSRLoopNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,15 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.ReplaceObserver; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.TruffleLanguage; +import com.oracle.truffle.api.frame.VirtualFrame; +import com.oracle.truffle.api.nodes.LoopNode; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.RepeatingNode; +import com.oracle.truffle.api.nodes.RootNode; public final class OptimizedOSRLoopNode extends LoopNode implements ReplaceObserver {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.common.*; +import jdk.internal.jvmci.common.JVMCIError; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.oracle.truffle.api.frame.*; +import com.oracle.truffle.api.frame.Frame; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlot; +import com.oracle.truffle.api.frame.FrameSlotTypeException; +import com.oracle.truffle.api.frame.MaterializedFrame; class ReadOnlyFrame implements Frame { private final Frame delegate;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCallBoundary.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCallBoundary.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.truffle; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD)
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,33 +22,48 @@ */ package com.oracle.graal.truffle; -import static com.oracle.graal.compiler.GraalCompiler.*; -import static jdk.internal.jvmci.code.CodeUtil.*; +import static com.oracle.graal.compiler.GraalCompiler.compileGraph; +import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; +import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; -import jdk.internal.jvmci.code.*; -import jdk.internal.jvmci.code.CallingConvention.*; - -import com.oracle.graal.debug.*; -import com.oracle.graal.debug.Debug.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.code.CallingConvention; +import jdk.internal.jvmci.code.CallingConvention.Type; +import jdk.internal.jvmci.code.CodeCacheProvider; +import jdk.internal.jvmci.code.CompilationResult; +import jdk.internal.jvmci.code.InstalledCode; import jdk.internal.jvmci.meta.Assumptions.Assumption; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.SpeculationLog; -import com.oracle.graal.compiler.target.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.compiler.target.Backend; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; +import com.oracle.graal.debug.DebugCloseable; +import com.oracle.graal.debug.DebugEnvironment; +import com.oracle.graal.debug.DebugMemUseTracker; +import com.oracle.graal.debug.DebugTimer; +import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import com.oracle.graal.lir.asm.*; -import com.oracle.graal.lir.phases.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.lir.asm.CompilationResultBuilderFactory; +import com.oracle.graal.lir.phases.LIRSuites; +import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.tiers.*; -import com.oracle.graal.phases.util.*; -import com.oracle.graal.truffle.nodes.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.phases.OptimisticOptimizations; +import com.oracle.graal.phases.PhaseSuite; +import com.oracle.graal.phases.tiers.HighTierContext; +import com.oracle.graal.phases.tiers.Suites; +import com.oracle.graal.phases.util.Providers; +import com.oracle.graal.truffle.nodes.AssumptionValidAssumption; +import com.oracle.truffle.api.Truffle; +import com.oracle.truffle.api.nodes.SlowPathException; +import com.oracle.truffle.api.nodes.UnexpectedResultException; /** * Implementation of the Truffle compiler using Graal.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; +import jdk.internal.jvmci.options.StableOptionValue; /** * Options for the Truffle compiler.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,17 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaField; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.MethodHandleAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.nodes.Node.Child;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleDebugJavaMethod.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleDebugJavaMethod.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,15 @@ */ package com.oracle.graal.truffle; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaMethod; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.internal.jvmci.meta.Signature; -import com.oracle.truffle.api.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.JavaMethodContext; +import com.oracle.truffle.api.RootCallTarget; /** * Enables a Truffle compilable to masquerade as a {@link JavaMethod} for use as a context value in
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,22 @@ */ package com.oracle.graal.truffle; -import java.io.*; -import java.util.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.phases.util.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.phases.util.Providers; public class TruffleExpansionLogger {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,19 @@ */ package com.oracle.graal.truffle; -import java.util.*; -import java.util.stream.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.stream.Collectors; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.CallTarget; +import com.oracle.truffle.api.CompilerOptions; import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeUtil; +import com.oracle.truffle.api.nodes.NodeVisitor; public class TruffleInlining implements Iterable<TruffleInliningDecision> {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningDecision.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningDecision.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.truffle; -import java.util.*; +import java.util.Iterator; +import java.util.List; public final class TruffleInliningDecision extends TruffleInlining implements Comparable<TruffleInliningDecision> {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningPolicy.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningPolicy.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import com.oracle.truffle.api.*; +import com.oracle.truffle.api.CompilerOptions; public interface TruffleInliningPolicy {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningProfile.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningProfile.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.truffle; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; public class TruffleInliningProfile {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleTreeDumpHandler.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleTreeDumpHandler.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,9 @@ */ package com.oracle.graal.truffle; -import com.oracle.graal.debug.*; - -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.debug.DebugDumpHandler; +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.nodes.GraphPrintVisitor; public class TruffleTreeDumpHandler implements DebugDumpHandler {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,16 @@ */ package com.oracle.graal.truffle.debug; -import java.util.*; +import java.util.Map; + +import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleCompilationListener; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.OptimizedDirectCallNode; +import com.oracle.graal.truffle.TruffleInlining; public abstract class AbstractDebugCompilationListener implements GraalTruffleCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,20 +22,35 @@ */ package com.oracle.graal.truffle.debug; -import static java.util.function.Function.*; -import static java.util.stream.Collectors.*; +import static java.util.function.Function.identity; +import static java.util.stream.Collectors.counting; +import static java.util.stream.Collectors.groupingBy; -import java.util.*; -import java.util.function.*; -import java.util.stream.*; +import java.util.Comparator; +import java.util.HashMap; +import java.util.IntSummaryStatistics; +import java.util.List; +import java.util.LongSummaryStatistics; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CompilationResult; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.OptimizedDirectCallNode; +import com.oracle.graal.truffle.TruffleCompilerOptions; +import com.oracle.graal.truffle.TruffleInlining; import com.oracle.graal.truffle.TruffleInlining.CallTreeNodeVisitor; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.truffle.TruffleInliningDecision; +import com.oracle.truffle.api.nodes.DirectCallNode; +import com.oracle.truffle.api.nodes.IndirectCallNode; +import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; public final class CompilationStatisticsListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/HistogramInlineInvokePlugin.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/HistogramInlineInvokePlugin.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.graal.truffle.debug; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.IntSummaryStatistics; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graphbuilderconf.InlineInvokePlugin; +import com.oracle.graal.nodes.BeginNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.VirtualState; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.truffle.OptimizedCallTarget; public class HistogramInlineInvokePlugin implements InlineInvokePlugin {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/PrintCallTargetProfiling.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/PrintCallTargetProfiling.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,17 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCallTargetProfiling; -import java.util.*; -import java.util.function.*; -import java.util.stream.*; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.*; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.TraceCompilationProfile; +import com.oracle.truffle.api.Truffle; public final class PrintCallTargetProfiling extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationASTListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationASTListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleCompilationAST; -import java.util.*; +import java.util.List; + +import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.TruffleInlining; import com.oracle.graal.truffle.TruffleInlining.CallTreeNodeVisitor; -import com.oracle.truffle.api.nodes.*; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeClass; +import com.oracle.truffle.api.nodes.NodeFieldAccessor; public final class TraceCompilationASTListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,23 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleCompilationCallTree; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.*; - -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.OptimizedDirectCallNode; +import com.oracle.graal.truffle.OptimizedIndirectCallNode; +import com.oracle.graal.truffle.TruffleInlining; import com.oracle.graal.truffle.TruffleInlining.CallTreeNodeVisitor; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.truffle.TruffleInliningDecision; +import com.oracle.truffle.api.nodes.Node; public final class TraceCompilationCallTreeListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.truffle.debug; -import static jdk.internal.jvmci.compiler.Compiler.*; +import static jdk.internal.jvmci.compiler.Compiler.PrintBailout; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.BailoutException; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; public final class TraceCompilationFailureListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,20 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleCompilation; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleCompilationDetails; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CompilationResult; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.source.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.OptimizedDirectCallNode; +import com.oracle.graal.truffle.TruffleInlining; +import com.oracle.truffle.api.source.SourceSection; public final class TraceCompilationListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationPolymorphismListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationPolymorphismListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,15 +22,18 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleCompilationPolymorphism; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.Map; -import jdk.internal.jvmci.code.*; +import jdk.internal.jvmci.code.CompilationResult; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeUtil; public final class TraceCompilationPolymorphismListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceInliningListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceInliningListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,14 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleInlining; -import com.oracle.graal.nodes.*; -import com.oracle.graal.truffle.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.TruffleInlining; +import com.oracle.graal.truffle.TruffleInliningDecision; +import com.oracle.graal.truffle.TruffleInliningProfile; public final class TraceInliningListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TracePerformanceWarningsListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TracePerformanceWarningsListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,12 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTrufflePerformanceWarnings; -import java.util.*; +import java.util.Map; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; public final class TracePerformanceWarningsListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceSplittingListener.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceSplittingListener.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,18 @@ */ package com.oracle.graal.truffle.debug; -import static com.oracle.graal.truffle.TruffleCompilerOptions.*; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleSplitting; +import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleSplittingNew; + +import java.util.Map; -import java.util.*; - -import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.nodes.*; +import com.oracle.graal.truffle.GraalTruffleRuntime; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.OptimizedDirectCallNode; +import com.oracle.graal.truffle.TruffleStamp; +import com.oracle.truffle.api.nodes.Node; +import com.oracle.truffle.api.nodes.NodeCost; +import com.oracle.truffle.api.nodes.NodeUtil; import com.oracle.truffle.api.nodes.NodeUtil.NodeCountFilter; public final class TraceSplittingListener extends AbstractDebugCompilationListener {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionValidAssumption.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionValidAssumption.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,9 @@ */ package com.oracle.graal.truffle.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.Assumptions; -import com.oracle.graal.truffle.*; +import com.oracle.graal.truffle.OptimizedAssumption; public final class AssumptionValidAssumption extends Assumptions.Assumption {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/IsCompilationConstantNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/IsCompilationConstantNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,16 +22,20 @@ */ package com.oracle.graal.truffle.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.spi.Lowerable; +import com.oracle.graal.nodes.spi.LoweringTool; @NodeInfo public final class IsCompilationConstantNode extends FloatingNode implements Lowerable, Canonicalizable {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/ObjectLocationIdentity.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/ObjectLocationIdentity.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.truffle.nodes; -import java.util.*; +import java.util.Objects; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; /** * A {@link LocationIdentity} wrapping an object.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,17 @@ */ package com.oracle.graal.truffle.nodes.asserts; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.VerificationError; +import com.oracle.graal.nodeinfo.InputType; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.StateSplit; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.util.GraphUtil; @NodeInfo public final class NeverPartOfCompilationNode extends ControlSinkNode implements StateSplit, IterableNodeType {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,13 @@ */ package com.oracle.graal.truffle.nodes.frame; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; @NodeInfo public final class ForceMaterializeNode extends FixedWithNextNode implements LIRLowerable {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/MaterializeFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/MaterializeFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.truffle.nodes.frame; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; /** * Intrinsic node for materializing a Truffle frame.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,47 @@ */ package com.oracle.graal.truffle.nodes.frame; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +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.ResolvedJavaField; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.truffle.*; -import com.oracle.graal.truffle.nodes.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.api.runtime.Graal; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.IterableNodeType; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.LockState; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.truffle.OptimizedAssumption; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.nodes.AssumptionValidAssumption; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlotKind; +import com.oracle.truffle.api.frame.VirtualFrame; /** * Intrinsic node representing the call for creating a frame in the {@link OptimizedCallTarget}
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,12 @@ */ package com.oracle.graal.truffle.phases; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.truffle.nodes.frame.*; +import com.oracle.graal.graph.VerificationError; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.phases.Phase; +import com.oracle.graal.truffle.nodes.frame.NewFrameNode; /** * Compiler phase for verifying that the Truffle virtual frame does not escape and can therefore be
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,32 +22,71 @@ */ package com.oracle.graal.truffle.substitutions; -import static java.lang.Character.*; +import static java.lang.Character.toUpperCase; -import java.util.concurrent.*; - -import jdk.internal.jvmci.meta.*; +import java.util.concurrent.Callable; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.compiler.common.calc.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graphbuilderconf.*; +import jdk.internal.jvmci.meta.Constant; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +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.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; + +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.compiler.common.calc.Condition; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graphbuilderconf.GraphBuilderContext; +import com.oracle.graal.graphbuilderconf.InvocationPlugin; import com.oracle.graal.graphbuilderconf.InvocationPlugin.Receiver; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; import com.oracle.graal.graphbuilderconf.InvocationPlugins.Registration; -import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.CallTargetNode.InvokeKind; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.replacements.nodes.arithmetic.*; -import com.oracle.graal.truffle.*; -import com.oracle.graal.truffle.nodes.*; -import com.oracle.graal.truffle.nodes.asserts.*; -import com.oracle.graal.truffle.nodes.frame.*; -import com.oracle.truffle.api.*; -import com.oracle.truffle.api.frame.*; +import com.oracle.graal.nodes.ConditionAnchorNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.DeoptimizeNode; +import com.oracle.graal.nodes.InvokeNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.PiArrayNode; +import com.oracle.graal.nodes.PiNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.calc.CompareNode; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.extended.BranchProbabilityNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.virtual.EnsureVirtualizedNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerAddExactNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerMulExactNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerMulHighNode; +import com.oracle.graal.replacements.nodes.arithmetic.IntegerSubExactNode; +import com.oracle.graal.replacements.nodes.arithmetic.UnsignedMulHighNode; +import com.oracle.graal.truffle.FrameWithBoxing; +import com.oracle.graal.truffle.FrameWithoutBoxing; +import com.oracle.graal.truffle.OptimizedAssumption; +import com.oracle.graal.truffle.OptimizedCallTarget; +import com.oracle.graal.truffle.TruffleCompilerOptions; +import com.oracle.graal.truffle.nodes.AssumptionValidAssumption; +import com.oracle.graal.truffle.nodes.IsCompilationConstantNode; +import com.oracle.graal.truffle.nodes.ObjectLocationIdentity; +import com.oracle.graal.truffle.nodes.asserts.NeverPartOfCompilationNode; +import com.oracle.graal.truffle.nodes.frame.ForceMaterializeNode; +import com.oracle.graal.truffle.nodes.frame.MaterializeFrameNode; +import com.oracle.graal.truffle.nodes.frame.NewFrameNode; +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.CompilerDirectives; +import com.oracle.truffle.api.ExactMath; +import com.oracle.truffle.api.frame.FrameDescriptor; /** * Provides {@link InvocationPlugin}s for Truffle classes.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleInvocationPluginProvider.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleInvocationPluginProvider.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,10 @@ */ package com.oracle.graal.truffle.substitutions; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.api.replacements.*; -import com.oracle.graal.graphbuilderconf.*; +import com.oracle.graal.api.replacements.SnippetReflectionProvider; +import com.oracle.graal.graphbuilderconf.InvocationPlugins; public interface TruffleInvocationPluginProvider { void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins, boolean canDelayIntrinsification, SnippetReflectionProvider snippetReflection);
--- a/graal/com.oracle.graal.virtual.bench/src/com/oracle/graal/virtual/bench/PartialEscapeBench.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual.bench/src/com/oracle/graal/virtual/bench/PartialEscapeBench.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,10 @@ */ package com.oracle.graal.virtual.bench; -import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; public class PartialEscapeBench {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,10 +22,12 @@ */ package com.oracle.graal.virtual.nodes; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.virtual.EscapeObjectState; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * This class encapsulated the materialized state of an escape analyzed object.
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,15 @@ */ package com.oracle.graal.virtual.nodes; -import java.util.*; +import java.util.List; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.NodeInputList; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.virtual.EscapeObjectState; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; /** * This class encapsulated the virtual state of an escape analyzed object.
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EarlyReadEliminationPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EarlyReadEliminationPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,13 @@ */ package com.oracle.graal.virtual.phases.ea; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.EscapeAnalyzeOnly; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class EarlyReadEliminationPhase extends EffectsPhase<PhaseContext> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,16 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.StructuredGraph; /** * An {@link EffectList} can be used to maintain a list of {@link Effect}s and backtrack to a
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsBlockState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsBlockState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; +import java.util.Iterator; +import java.util.Map; public abstract class EffectsBlockState<T extends EffectsBlockState<T>> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,25 +22,44 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; +import jdk.internal.jvmci.common.JVMCIError; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.iterators.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.graph.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.BlockMap; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.NodeMap; +import com.oracle.graal.graph.iterators.NodeIterable; +import com.oracle.graal.nodes.AbstractMergeNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.LogicConstantNode; +import com.oracle.graal.nodes.LogicNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.BoxNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.graph.ReentrantBlockIterator; import com.oracle.graal.phases.graph.ReentrantBlockIterator.BlockIteratorClosure; import com.oracle.graal.phases.graph.ReentrantBlockIterator.LoopInfo; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.phases.schedule.SchedulePhase; public abstract class EffectsClosure<BlockT extends EffectsBlockState<BlockT>> extends EffectsPhase.Closure<BlockT> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,25 @@ */ package com.oracle.graal.virtual.phases.ea; -import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.*; -import static com.oracle.graal.debug.Debug.*; +import static com.oracle.graal.debug.Debug.isEnabled; +import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; -import java.util.*; +import java.util.Set; -import com.oracle.graal.debug.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.Debug.Scope; import com.oracle.graal.graph.Graph.NodeEventScope; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.util.*; -import com.oracle.graal.phases.graph.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.spi.Simplifiable; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; +import com.oracle.graal.phases.common.util.HashSetNodeEventListener; +import com.oracle.graal.phases.graph.ReentrantBlockIterator; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.PhaseContext; public abstract class EffectsPhase<PhaseContextT extends PhaseContext> extends BasePhase<PhaseContextT> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/GraphEffectList.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/GraphEffectList.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,22 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; +import java.util.ArrayList; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.debug.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.common.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.IfNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.debug.DynamicCounterNode; +import com.oracle.graal.nodes.debug.WeakCounterNode; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.EscapeObjectState; +import com.oracle.graal.phases.common.DeadCodeEliminationPhase; public class GraphEffectList extends EffectList {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ObjectState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ObjectState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,18 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; - -import com.oracle.graal.debug.*; +import java.util.Arrays; +import java.util.List; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.virtual.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.virtual.EscapeObjectState; +import com.oracle.graal.nodes.virtual.LockState; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.virtual.nodes.MaterializedObjectState; +import com.oracle.graal.virtual.nodes.VirtualObjectState; /** * This class describes the state of a virtual object while iterating over the graph. It describes
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationBlockState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationBlockState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,13 +22,18 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.virtual.*; +import jdk.internal.jvmci.meta.LocationIdentity; + +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.VirtualInstanceNode; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; public class PEReadEliminationBlockState extends PartialEscapeBlockState<PEReadEliminationBlockState> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationClosure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationClosure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,23 +22,45 @@ */ package com.oracle.graal.virtual.phases.ea; -import static com.oracle.graal.nodes.NamedLocationIdentity.*; +import static com.oracle.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.type.*; -import com.oracle.graal.nodes.util.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.NamedLocationIdentity; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.extended.UnboxNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.java.ArrayLengthNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.LoadIndexedNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.java.StoreIndexedNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.type.StampTool; +import com.oracle.graal.nodes.util.GraphUtil; +import com.oracle.graal.nodes.virtual.VirtualArrayNode; +import com.oracle.graal.phases.schedule.SchedulePhase; import com.oracle.graal.virtual.phases.ea.PEReadEliminationBlockState.ReadCacheEntry; public class PEReadEliminationClosure extends PartialEscapeClosure<PEReadEliminationBlockState> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeBlockState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeBlockState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,21 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.virtual.AllocatedObjectNode; +import com.oracle.graal.nodes.virtual.CommitAllocationNode; +import com.oracle.graal.nodes.virtual.LockState; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; public abstract class PartialEscapeBlockState<T extends PartialEscapeBlockState<T>> extends EffectsBlockState<T> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,24 +22,56 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; -import java.util.function.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.IntFunction; -import com.oracle.graal.debug.*; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.compiler.common.util.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.cfg.Loop; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.compiler.common.util.ArraySet; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.DebugMetric; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeBitMap; +import com.oracle.graal.graph.NodePosIterator; +import com.oracle.graal.graph.Position; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.nodes.CallTargetNode; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.ControlSinkNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.FrameState; +import com.oracle.graal.nodes.Invoke; +import com.oracle.graal.nodes.LoopBeginNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.VirtualState; import com.oracle.graal.nodes.VirtualState.NodeClosure; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.schedule.*; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.spi.NodeWithState; +import com.oracle.graal.nodes.spi.Virtualizable; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.schedule.SchedulePhase; public abstract class PartialEscapeClosure<BlockT extends PartialEscapeBlockState<BlockT>> extends EffectsClosure<BlockT> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,25 @@ */ package com.oracle.graal.virtual.phases.ea; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.virtual.phases.ea.PartialEscapePhase.Options.*; +import static com.oracle.graal.compiler.common.GraalOptions.EscapeAnalysisIterations; +import static com.oracle.graal.compiler.common.GraalOptions.EscapeAnalyzeOnly; +import static com.oracle.graal.virtual.phases.ea.PartialEscapePhase.Options.OptEarlyReadElimination; -import java.util.*; +import java.util.Set; -import jdk.internal.jvmci.options.*; +import jdk.internal.jvmci.options.Option; +import jdk.internal.jvmci.options.OptionType; +import jdk.internal.jvmci.options.OptionValue; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; -import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.schedule.*; -import com.oracle.graal.phases.tiers.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.StructuredGraph; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; +import com.oracle.graal.phases.BasePhase; +import com.oracle.graal.phases.common.CanonicalizerPhase; +import com.oracle.graal.phases.schedule.SchedulePhase; +import com.oracle.graal.phases.tiers.PhaseContext; public class PartialEscapePhase extends EffectsPhase<PhaseContext> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationBlockState.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationBlockState.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.virtual.phases.ea; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.nodes.ValueNode; public class ReadEliminationBlockState extends EffectsBlockState<ReadEliminationBlockState> {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,22 +22,41 @@ */ package com.oracle.graal.virtual.phases.ea; -import static jdk.internal.jvmci.meta.LocationIdentity.*; +import static jdk.internal.jvmci.meta.LocationIdentity.any; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LocationIdentity; -import com.oracle.graal.compiler.common.*; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.memory.*; -import com.oracle.graal.nodes.memory.address.*; -import com.oracle.graal.nodes.util.*; +import com.oracle.graal.compiler.common.CollectionsFactory; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.graph.Node; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.LoopExitNode; +import com.oracle.graal.nodes.PhiNode; +import com.oracle.graal.nodes.ProxyNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.ValuePhiNode; +import com.oracle.graal.nodes.ValueProxyNode; +import com.oracle.graal.nodes.cfg.Block; +import com.oracle.graal.nodes.cfg.ControlFlowGraph; +import com.oracle.graal.nodes.extended.GuardedNode; +import com.oracle.graal.nodes.extended.UnsafeAccessNode; +import com.oracle.graal.nodes.extended.UnsafeLoadNode; +import com.oracle.graal.nodes.extended.UnsafeStoreNode; +import com.oracle.graal.nodes.extended.ValueAnchorNode; +import com.oracle.graal.nodes.java.AccessFieldNode; +import com.oracle.graal.nodes.java.LoadFieldNode; +import com.oracle.graal.nodes.java.StoreFieldNode; +import com.oracle.graal.nodes.memory.MemoryCheckpoint; +import com.oracle.graal.nodes.memory.ReadNode; +import com.oracle.graal.nodes.memory.WriteNode; +import com.oracle.graal.nodes.memory.address.OffsetAddressNode; +import com.oracle.graal.nodes.util.GraphUtil; import com.oracle.graal.virtual.phases.ea.ReadEliminationBlockState.CacheEntry; import com.oracle.graal.virtual.phases.ea.ReadEliminationBlockState.LoadCacheEntry; import com.oracle.graal.virtual.phases.ea.ReadEliminationBlockState.ReadCacheEntry;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,17 +22,21 @@ */ package com.oracle.graal.virtual.phases.ea; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.TraceEscapeAnalysis; -import java.util.*; +import java.util.List; +import java.util.Map; + +import jdk.internal.jvmci.common.JVMCIError; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.common.*; -import com.oracle.graal.debug.*; - -import jdk.internal.jvmci.meta.*; - -import com.oracle.graal.graph.*; -import com.oracle.graal.nodes.*; +import com.oracle.graal.debug.Debug; +import com.oracle.graal.debug.TTY; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeFlood; +import com.oracle.graal.nodes.AbstractEndNode; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.StructuredGraph; public final class VirtualUtil {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,19 +22,23 @@ */ package com.oracle.graal.virtual.phases.ea; -import static com.oracle.graal.compiler.common.GraalOptions.*; +import static com.oracle.graal.compiler.common.GraalOptions.MaximumEscapeAnalysisArrayLength; + +import java.util.List; -import java.util.*; - -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.MetaAccessProvider; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.virtual.*; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodes.FixedNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.calc.FloatingNode; +import com.oracle.graal.nodes.java.MonitorIdNode; +import com.oracle.graal.nodes.spi.VirtualizerTool; +import com.oracle.graal.nodes.virtual.VirtualObjectNode; class VirtualizerToolImpl implements VirtualizerTool, CanonicalizerTool {
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/BarrieredAccess.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/BarrieredAccess.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/ObjectAccess.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/ObjectAccess.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/Pointer.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/Pointer.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.LocationIdentity; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordBase.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordBase.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.TrustedInterface; public interface WordBase extends TrustedInterface {
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,11 +22,16 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.JavaType; +import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.internal.jvmci.meta.ResolvedJavaType; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.type.*; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.type.StampTool; import com.oracle.graal.word.Word.Operation; /**
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,14 +22,26 @@ */ package com.oracle.graal.word.nodes; -import jdk.internal.jvmci.meta.*; +import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.internal.jvmci.meta.JavaConstant; +import jdk.internal.jvmci.meta.JavaKind; +import jdk.internal.jvmci.meta.LIRKind; +import jdk.internal.jvmci.meta.Value; -import com.oracle.graal.compiler.common.type.*; -import com.oracle.graal.graph.*; -import com.oracle.graal.graph.spi.*; -import com.oracle.graal.nodeinfo.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.compiler.common.type.AbstractPointerStamp; +import com.oracle.graal.compiler.common.type.ObjectStamp; +import com.oracle.graal.compiler.common.type.Stamp; +import com.oracle.graal.compiler.common.type.StampFactory; +import com.oracle.graal.graph.Node; +import com.oracle.graal.graph.NodeClass; +import com.oracle.graal.graph.spi.Canonicalizable; +import com.oracle.graal.graph.spi.CanonicalizerTool; +import com.oracle.graal.nodeinfo.NodeInfo; +import com.oracle.graal.nodes.ConstantNode; +import com.oracle.graal.nodes.FixedWithNextNode; +import com.oracle.graal.nodes.ValueNode; +import com.oracle.graal.nodes.spi.LIRLowerable; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; import com.oracle.graal.word.Word.Opcode; /**
--- a/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java Wed Sep 16 15:43:24 2015 +0200 +++ b/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java Wed Sep 16 21:17:42 2015 +0200 @@ -22,9 +22,10 @@ */ package com.oracle.nfi; -import java.lang.reflect.*; +import java.lang.reflect.Method; -import com.oracle.nfi.api.*; +import com.oracle.nfi.api.NativeFunctionInterface; +import com.oracle.nfi.api.NativeFunctionInterfaceAccess; /** * Class for obtaining the {@link NativeFunctionInterface} (if any) provided by the VM.