Mercurial > hg > graal-jvmci-8

changeset 24138:b01354ea98ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bring jvmci-8 more into sync with jvmci-9
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Jun 2017 15:23:09 +0200
parents 6523380966cd
children 0c5304ad61bd
files jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
diffstat 4 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java	Fri May 19 14:05:50 2017 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java	Mon Jun 12 15:23:09 2017 +0200
@@ -111,9 +111,7 @@
      *
      * @see <a href="https://bugs.openjdk.java.net/browse/JDK-8076112">JDK-8076112</a>
      */
-    default boolean isIntrinsicCandidate() {
-        return true;
-    }
+    boolean isIntrinsicCandidate();
 
     /**
      * Allocates a compile id for this method by asking the VM for one.
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java	Fri May 19 14:05:50 2017 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java	Mon Jun 12 15:23:09 2017 +0200
@@ -759,6 +759,10 @@
         return UNSAFE.getByte(metaspaceMethod + config.methodIntrinsicIdOffset) & 0xff;
     }
 
+    public boolean isIntrinsicCandidate() {
+        return true;
+    }
+
     /**
      * Allocates a compile id for this method by asking the VM for one.
      *
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java	Fri May 19 14:05:50 2017 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java	Mon Jun 12 15:23:09 2017 +0200
@@ -113,7 +113,5 @@
      * @return the value of the fingerprint ({@code 0} for arrays and synthetic classes or if the VM
      *         does not support fingerprints)
      */
-    default long getFingerprint() {
-        return 0L;
-    }
+    long getFingerprint();
 }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Fri May 19 14:05:50 2017 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java	Mon Jun 12 15:23:09 2017 +0200
@@ -922,4 +922,8 @@
     public boolean isCloneableWithAllocation() {
         return (getAccessFlags() & config().jvmAccIsCloneable) != 0;
     }
+
+    public long getFingerprint() {
+        return 0L;
+    }
 }