# HG changeset patch # User Roland Schatz # Date 1442935809 -7200 # Node ID 37d7baeb6d7a83603217c80981fa34f9be73b025 # Parent 90c5039a70f1e9c99b7bf3a887dd7a3be212cfb2 Update jvmci import: Make implementation classes package private. diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java --- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java Tue Sep 22 17:30:09 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,6 @@ 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; @@ -49,7 +48,7 @@ @Test public void testModifiersForInternal() { for (Class c : classesWithInternalFields) { - HotSpotResolvedObjectType type = HotSpotResolvedObjectTypeImpl.fromObjectClass(c); + HotSpotResolvedObjectType type = HotSpotResolvedObjectType.fromObjectClass(c); for (ResolvedJavaField field : type.getInstanceFields(false)) { if (field.isInternal()) { Assert.assertEquals(0, ~ModifiersProvider.jvmFieldModifiers() & field.getModifiers()); @@ -59,13 +58,13 @@ } /** - * Tests that {@link HotSpotResolvedObjectTypeImpl#createField(String, JavaType, long, int)} - * always returns the same object for an internal field. + * Tests that {@link HotSpotResolvedObjectType#createField(String, JavaType, long, int)} always + * returns the same object for an internal field. */ @Test public void testCachingForInternalFields() { for (Class c : classesWithInternalFields) { - HotSpotResolvedObjectType type = HotSpotResolvedObjectTypeImpl.fromObjectClass(c); + HotSpotResolvedObjectType type = HotSpotResolvedObjectType.fromObjectClass(c); for (ResolvedJavaField field : type.getInstanceFields(false)) { if (field.isInternal()) { HotSpotResolvedJavaField expected = (HotSpotResolvedJavaField) field; diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java --- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java Tue Sep 22 17:30:09 2015 +0200 @@ -24,7 +24,7 @@ import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl; +import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; import jdk.internal.jvmci.hotspot.HotSpotVMConfig; import jdk.internal.jvmci.meta.Constant; import jdk.internal.jvmci.meta.JavaKind; @@ -43,13 +43,13 @@ @Test public void testGetSourceFileName() throws Throwable { - Assert.assertEquals("Object.java", HotSpotResolvedObjectTypeImpl.fromObjectClass(Object.class).getSourceFileName()); - Assert.assertEquals("HotSpotResolvedObjectTypeTest.java", HotSpotResolvedObjectTypeImpl.fromObjectClass(this.getClass()).getSourceFileName()); + Assert.assertEquals("Object.java", HotSpotResolvedObjectType.fromObjectClass(Object.class).getSourceFileName()); + Assert.assertEquals("HotSpotResolvedObjectTypeTest.java", HotSpotResolvedObjectType.fromObjectClass(this.getClass()).getSourceFileName()); } @Test public void testKlassLayoutHelper() { - Constant klass = HotSpotResolvedObjectTypeImpl.fromObjectClass(this.getClass()).klass(); + Constant klass = HotSpotResolvedObjectType.fromObjectClass(this.getClass()).klass(); MemoryAccessProvider memoryAccess = getProviders().getConstantReflection().getMemoryAccessProvider(); HotSpotVMConfig config = config(); Constant c = StampFactory.forKind(JavaKind.Int).readConstant(memoryAccess, klass, config.klassLayoutHelperOffset); diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Tue Sep 22 17:30:09 2015 +0200 @@ -43,7 +43,6 @@ 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; @@ -290,8 +289,7 @@ if ((config.ciTime || config.ciTimeEach) && installedCode != null) { long timeUnitsPerSecond = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS); CompilerToVM c2vm = jvmciRuntime.getCompilerToVM(); - HotSpotResolvedJavaMethodImpl methodImpl = (HotSpotResolvedJavaMethodImpl) method; - c2vm.notifyCompilationStatistics(id, methodImpl, entryBCI != Compiler.INVOCATION_ENTRY_BCI, compiledBytecodes, compilationTime, timeUnitsPerSecond, installedCode); + c2vm.notifyCompilationStatistics(id, method, entryBCI != Compiler.INVOCATION_ENTRY_BCI, compiledBytecodes, compilationTime, timeUnitsPerSecond, installedCode); } } } diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Tue Sep 22 17:30:09 2015 +0200 @@ -56,13 +56,10 @@ import java.util.stream.Collectors; import jdk.internal.jvmci.compiler.Compiler; -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; @@ -73,6 +70,7 @@ import jdk.internal.jvmci.options.OptionsParser.OptionConsumer; import jdk.internal.jvmci.runtime.JVMCI; +import com.oracle.graal.bytecode.Bytecodes; import com.oracle.graal.compiler.CompilerThreadFactory; import com.oracle.graal.compiler.CompilerThreadFactory.DebugConfigAccess; import com.oracle.graal.debug.Debug; @@ -206,7 +204,7 @@ // ...but we want to see exceptions. config.putIfAbsent(PrintBailout, true); config.putIfAbsent(PrintStackTraceOnException, true); - config.putIfAbsent(HotSpotResolvedJavaMethodImpl.Options.UseProfilingInformation, false); + config.putIfAbsent(HotSpotResolvedJavaMethod.Options.UseProfilingInformation, false); } public CompileTheWorld(HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotGraalCompiler compiler) { @@ -372,10 +370,10 @@ // Pre-load all classes in the constant pool. try { - HotSpotResolvedObjectType objectType = HotSpotResolvedObjectTypeImpl.fromObjectClass(javaClass); + HotSpotResolvedObjectType objectType = HotSpotResolvedObjectType.fromObjectClass(javaClass); ConstantPool constantPool = objectType.getConstantPool(); for (int cpi = 1; cpi < constantPool.length(); cpi++) { - constantPool.loadReferencedType(cpi, HotSpotConstantPool.Bytecodes.LDC); + constantPool.loadReferencedType(cpi, Bytecodes.LDC); } } catch (Throwable t) { // If something went wrong during pre-loading we just ignore it. diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Tue Sep 22 17:30:09 2015 +0200 @@ -45,7 +45,7 @@ import jdk.internal.jvmci.hotspot.CompilerToVM; import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; import jdk.internal.jvmci.hotspot.HotSpotProxified; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl; +import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; import jdk.internal.jvmci.hotspot.HotSpotStackFrameReference; import jdk.internal.jvmci.hotspot.HotSpotVMConfig; import jdk.internal.jvmci.inittimer.InitTimer; @@ -226,8 +226,8 @@ @Override public T iterateFrames(ResolvedJavaMethod[] initialMethods, ResolvedJavaMethod[] matchingMethods, int initialSkip, InspectedFrameVisitor visitor) { - final HotSpotResolvedJavaMethodImpl[] initialMetaMethods = toHotSpotResolvedJavaMethodImpls(initialMethods); - final HotSpotResolvedJavaMethodImpl[] matchingMetaMethods = toHotSpotResolvedJavaMethodImpls(matchingMethods); + final HotSpotResolvedJavaMethod[] initialMetaMethods = toHotSpotResolvedJavaMethods(initialMethods); + final HotSpotResolvedJavaMethod[] matchingMetaMethods = toHotSpotResolvedJavaMethods(matchingMethods); CompilerToVM compilerToVM = runtime().getCompilerToVM(); HotSpotStackFrameReference current = compilerToVM.getNextStackFrame(null, initialMetaMethods, initialSkip); @@ -241,15 +241,15 @@ return null; } - private static HotSpotResolvedJavaMethodImpl[] toHotSpotResolvedJavaMethodImpls(ResolvedJavaMethod[] methods) { + private static HotSpotResolvedJavaMethod[] toHotSpotResolvedJavaMethods(ResolvedJavaMethod[] methods) { if (methods == null) { return null; - } else if (methods instanceof HotSpotResolvedJavaMethodImpl[]) { - return (HotSpotResolvedJavaMethodImpl[]) methods; + } else if (methods instanceof HotSpotResolvedJavaMethod[]) { + return (HotSpotResolvedJavaMethod[]) methods; } else { - HotSpotResolvedJavaMethodImpl[] result = new HotSpotResolvedJavaMethodImpl[methods.length]; + HotSpotResolvedJavaMethod[] result = new HotSpotResolvedJavaMethod[methods.length]; for (int i = 0; i < result.length; i++) { - result[i] = (HotSpotResolvedJavaMethodImpl) methods[i]; + result[i] = (HotSpotResolvedJavaMethod) methods[i]; } return result; } diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Tue Sep 22 17:30:09 2015 +0200 @@ -34,7 +34,6 @@ import java.lang.invoke.VolatileCallSite; import java.util.zip.CRC32; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstantImpl; import jdk.internal.jvmci.hotspot.HotSpotVMConfig; import jdk.internal.jvmci.meta.ConstantReflectionProvider; import jdk.internal.jvmci.meta.JavaConstant; @@ -262,7 +261,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) { if (receiver.isConstant()) { StableOptionValue option = snippetReflection.asObject(StableOptionValue.class, (JavaConstant) receiver.get().asConstant()); - b.addPush(JavaKind.Object, ConstantNode.forConstant(HotSpotObjectConstantImpl.forObject(option.getValue()), b.getMetaAccess())); + b.addPush(JavaKind.Object, ConstantNode.forConstant(snippetReflection.forObject(option.getValue()), b.getMetaAccess())); return true; } return false; diff -r 90c5039a70f1 -r 37d7baeb6d7a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Tue Sep 22 15:41:43 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Tue Sep 22 17:30:09 2015 +0200 @@ -36,7 +36,6 @@ import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl; import jdk.internal.jvmci.hotspot.HotSpotVMConfig; import jdk.internal.jvmci.meta.Assumptions; import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; @@ -393,7 +392,7 @@ ObjectStamp stamp = (ObjectStamp) javaObject.stamp(); HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) stamp.javaType(tool.getMetaAccess()); if (type.isArray() && !type.getComponentType().isPrimitive()) { - int layout = ((HotSpotResolvedObjectTypeImpl) type).layoutHelper(); + int layout = type.layoutHelper(); return ConstantNode.forInt(layout); } } diff -r 90c5039a70f1 -r 37d7baeb6d7a mx.graal/suite.py --- a/mx.graal/suite.py Tue Sep 22 15:41:43 2015 +0200 +++ b/mx.graal/suite.py Tue Sep 22 17:30:09 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "4371622a22da480f866d821d190ab511175068d2", + "version" : "ed53e370f04cfc356f3eb77774361eb9e47195d7", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},