Mercurial > hg > graal-compiler
changeset 22791:c356d2e4659d
Update jvmci import.
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Fri Oct 09 15:01:49 2015 +0200 @@ -39,7 +39,6 @@ import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider; import jdk.vm.ci.hotspot.HotSpotVMConfig; import jdk.vm.ci.inittimer.InitTimer; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.Value; import jdk.vm.ci.runtime.JVMCIBackend; import jdk.vm.ci.service.ServiceProvider; @@ -167,12 +166,12 @@ registers.getHeapBaseRegister())); } - protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalRuntimeProvider runtime, ConstantReflectionProvider constantReflection) { + protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalRuntimeProvider runtime, HotSpotConstantReflectionProvider constantReflection) { return new HotSpotSnippetReflectionProvider(runtime, constantReflection); } protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, - HotSpotRegistersProvider registers, ConstantReflectionProvider constantReflection, TargetDescription target) { + HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, TargetDescription target) { return new AMD64HotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, target); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Fri Oct 09 15:01:49 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 @@ -23,8 +23,8 @@ package com.oracle.graal.hotspot.amd64; import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; import jdk.vm.ci.hotspot.HotSpotVMConfig; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; @@ -42,7 +42,7 @@ private AMD64ConvertSnippets.Templates convertSnippets; public AMD64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, - ConstantReflectionProvider constantReflection, TargetDescription target) { + HotSpotConstantReflectionProvider constantReflection, TargetDescription target) { super(runtime, metaAccess, foreignCalls, registers, constantReflection, target); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Fri Oct 09 15:01:49 2015 +0200 @@ -35,7 +35,6 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider; import jdk.vm.ci.hotspot.HotSpotVMConfig; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.Value; import jdk.vm.ci.runtime.JVMCIBackend; import jdk.vm.ci.service.ServiceProvider; @@ -117,7 +116,7 @@ } protected HotSpotLoweringProvider createLowerer(HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess, HotSpotForeignCallsProvider foreignCalls, - HotSpotRegistersProvider registers, ConstantReflectionProvider constantReflection, TargetDescription target) { + HotSpotRegistersProvider registers, HotSpotConstantReflectionProvider constantReflection, TargetDescription target) { return new SPARCHotSpotLoweringProvider(runtime, metaAccess, foreignCalls, registers, constantReflection, target); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Fri Oct 09 15:01:49 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 @@ -23,7 +23,7 @@ package com.oracle.graal.hotspot.sparc; import jdk.vm.ci.code.TargetDescription; -import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; @@ -37,7 +37,7 @@ public class SPARCHotSpotLoweringProvider extends DefaultHotSpotLoweringProvider { public SPARCHotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, - ConstantReflectionProvider constantReflection, TargetDescription target) { + HotSpotConstantReflectionProvider constantReflection, TargetDescription target) { super(runtime, metaAccess, foreignCalls, registers, constantReflection, target); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java Fri Oct 09 15:01:49 2015 +0200 @@ -42,10 +42,10 @@ import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.hotspot.HotSpotVMConfig; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; @@ -157,7 +157,7 @@ protected final HotSpotGraalRuntimeProvider runtime; protected final ForeignCallsProvider foreignCalls; protected final HotSpotRegistersProvider registers; - protected final ConstantReflectionProvider constantReflection; + protected final HotSpotConstantReflectionProvider constantReflection; protected CheckCastDynamicSnippets.Templates checkcastDynamicSnippets; protected InstanceOfSnippets.Templates instanceofSnippets; @@ -171,7 +171,7 @@ protected RuntimeStringSnippets.Templates runtimeStringSnippets; public DefaultHotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers, - ConstantReflectionProvider constantReflection, TargetDescription target) { + HotSpotConstantReflectionProvider constantReflection, TargetDescription target) { super(metaAccess, target); this.runtime = runtime; this.foreignCalls = foreignCalls;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java Fri Oct 09 15:01:49 2015 +0200 @@ -23,9 +23,9 @@ package com.oracle.graal.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; import jdk.vm.ci.hotspot.HotSpotObjectConstant; import jdk.vm.ci.hotspot.HotSpotVMConfig; -import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; @@ -37,9 +37,9 @@ public class HotSpotSnippetReflectionProvider implements SnippetReflectionProvider { private final HotSpotGraalRuntimeProvider runtime; - private final ConstantReflectionProvider constantReflection; + private final HotSpotConstantReflectionProvider constantReflection; - public HotSpotSnippetReflectionProvider(HotSpotGraalRuntimeProvider runtime, ConstantReflectionProvider constantReflection) { + public HotSpotSnippetReflectionProvider(HotSpotGraalRuntimeProvider runtime, HotSpotConstantReflectionProvider constantReflection) { this.runtime = runtime; this.constantReflection = constantReflection; }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Thu Oct 08 17:41:33 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Fri Oct 09 15:01:49 2015 +0200 @@ -120,10 +120,6 @@ return graalConstantReflection.forString(value); } - public JavaConstant forObject(Object value) { - return graalConstantReflection.forObject(value); - } - public ResolvedJavaType asJavaType(Constant constant) { return graalConstantReflection.asJavaType(constant); }
--- a/mx.graal/suite.py Thu Oct 08 17:41:33 2015 -0700 +++ b/mx.graal/suite.py Fri Oct 09 15:01:49 2015 +0200 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "1bbd4a7c274b3d1fcdfe0846d652dcca76a87f99", + "version" : "3e573d7d32a7a6cfb2d7dc3aa49a743a6c25d088", "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"},