Mercurial > hg > graal-compiler

changeset 23208:58eb143a8259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated jvmci import
author Doug Simon <doug.simon@oracle.com>
date Mon, 21 Dec 2015 00:20:11 +0100
parents c07e0f138412
children f35e653aa876
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraalConstantReflectionProvider.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java mx.graal/suite.py
diffstat 3 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraalConstantReflectionProvider.java	Fri Dec 18 16:08:51 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraalConstantReflectionProvider.java	Mon Dec 21 00:20:11 2015 +0100
@@ -35,7 +35,6 @@
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaField;
 import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaField;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -49,7 +48,7 @@
 
 /**
  * Extends {@link HotSpotConstantReflectionProvider} to override the implementation of
- * {@link #readConstantFieldValue(JavaField, JavaConstant)} with Graal specific semantics.
+ * {@link #readConstantFieldValue(ResolvedJavaField, JavaConstant)} with Graal specific semantics.
  */
 public class HotSpotGraalConstantReflectionProvider extends HotSpotConstantReflectionProvider {
 
@@ -58,7 +57,7 @@
     }
 
     @Override
-    public JavaConstant readConstantFieldValue(JavaField field, JavaConstant receiver) {
+    public JavaConstant readConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         MetaAccessProvider metaAccess = runtime.getHostJVMCIBackend().getMetaAccess();
         assert !ImmutableCode.getValue() || isCalledForSnippets(metaAccess) || SnippetGraphUnderConstruction.get() != null || FieldReadEnabledInImmutableCode.get() == Boolean.TRUE : receiver;
         return super.readConstantFieldValue(field, receiver);
@@ -116,8 +115,8 @@
 
         /**
          * If the compiler is configured for AOT mode,
-         * {@link #readConstantFieldValue(JavaField, JavaConstant)} should be only called for
-         * snippets or replacements.
+         * {@link #readConstantFieldValue(ResolvedJavaField, JavaConstant)} should be only called
+         * for snippets or replacements.
          */
         static boolean isCalledForSnippets(MetaAccessProvider metaAccess) {
             assert ImmutableCode.getValue();
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java	Fri Dec 18 16:08:51 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java	Mon Dec 21 00:20:11 2015 +0100
@@ -25,7 +25,6 @@
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaField;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.MemoryAccessProvider;
@@ -67,8 +66,7 @@
         return graalConstantReflection.readConstantArrayElementForOffset(array, offset);
     }
 
-    public JavaConstant readConstantFieldValue(JavaField field0, JavaConstant receiver) {
-        ResolvedJavaField field = (ResolvedJavaField) field0;
+    public JavaConstant readConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         if (!field.isStatic() && receiver.isNonNull()) {
             JavaType fieldType = field.getType();
             if (field.isFinal() || field.getAnnotation(CompilationFinal.class) != null ||
@@ -100,11 +98,11 @@
         return true;
     }
 
-    public JavaConstant readFieldValue(JavaField field, JavaConstant receiver) {
+    public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
         return graalConstantReflection.readFieldValue(field, receiver);
     }
 
-    public JavaConstant readStableFieldValue(JavaField field, JavaConstant receiver, boolean isDefaultStable) {
+    public JavaConstant readStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefaultStable) {
         return graalConstantReflection.readStableFieldValue(field, receiver, isDefaultStable);
     }
 
--- a/mx.graal/suite.py	Fri Dec 18 16:08:51 2015 +0100
+++ b/mx.graal/suite.py	Mon Dec 21 00:20:11 2015 +0100
@@ -39,7 +39,7 @@
             {
                "name" : "jvmci",
                "optional" : "true",
-               "version" : "d52d25716994076d542b0f606d1c6cf5843239ee",
+               "version" : "f4c4cc22a31ccc6efec87a3335047722710cf540",
                "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"},