[GR-5926] JVMCI support for libgraal.

PullRequest: graal-jvmci-8/52

Author: tkrodriguez

hotspot/.project

@@ -90,11 +90,6 @@
 			<type>2</type>
 			<locationURI>PARENT-1-PROJECT_LOC/agent</locationURI>
 		</link>
-		<link>
-			<name>build</name>
-			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/build</locationURI>
-		</link>
 		<link>
 			<name>make</name>
 			<type>2</type>

jvmci/jdk.vm.ci.code/snapshot.sigtest

@@ -276,16 +276,17 @@ meth public !varargs java.lang.Object executeVarargs(java.lang.Object[]) throws
 meth public boolean isAlive()
 meth public boolean isValid()
 meth public byte[] getCode()
-meth public final long getAddress()
-meth public final long getEntryPoint()
 meth public final long getVersion()
 meth public java.lang.String getName()
+meth public long getAddress()
+meth public long getEntryPoint()
 meth public long getStart()
 meth public void invalidate()
 supr java.lang.Object
 
 CLSS public final jdk.vm.ci.code.InvalidInstalledCodeException
 cons public init()
+cons public init(java.lang.String)
 supr java.lang.Exception
 hfds serialVersionUID
 

jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java

@@ -193,7 +193,9 @@ public final int requiredBarriers(int barriers) {
     public abstract PlatformKind getLargestStorableKind(RegisterCategory category);
 
     /**
-     * Return the {@link PlatformKind} that is used to store values of a given {@link JavaKind}.
+     * Gets the {@link PlatformKind} that is used to store values of a given {@link JavaKind}.
+     *
+     * @return {@code null} if there no deterministic {@link PlatformKind} for {@code javaKind}
      */
     public abstract PlatformKind getPlatformKind(JavaKind javaKind);
 

jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeCacheProvider.java

@@ -46,6 +46,8 @@ public interface CodeCacheProvider {
      *            created.
      * @return a reference to the ready-to-run code
      * @throws BailoutException if the code installation failed
+     * @throws IllegalArgumentException if {@code installedCode != null} and this object does not
+     *             support a predefined {@link InstalledCode} object
      */
     default InstalledCode addCode(ResolvedJavaMethod method, CompiledCode compiledCode, SpeculationLog log, InstalledCode installedCode) {
         return installCode(method, compiledCode, installedCode, log, false);
@@ -60,6 +62,8 @@ default InstalledCode addCode(ResolvedJavaMethod method, CompiledCode compiledCo
      * @param compiledCode the compiled code to be added
      * @return a reference to the ready-to-run code
      * @throws BailoutException if the code installation failed
+     * @throws IllegalArgumentException if {@code installedCode != null} and this object does not
+     *             support a predefined {@link InstalledCode} object
      */
     default InstalledCode setDefaultCode(ResolvedJavaMethod method, CompiledCode compiledCode) {
         return installCode(method, compiledCode, null, null, true);

jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/InstalledCode.java

@@ -54,14 +54,14 @@ public InstalledCode(String name) {
     /**
      * @return the address of entity representing this installed code.
      */
-    public final long getAddress() {
+    public long getAddress() {
         return address;
     }
 
     /**
      * @return the address of the normal entry point of the installed code.
      */
-    public final long getEntryPoint() {
+    public long getEntryPoint() {
         return entryPoint;
     }
 

jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/InvalidInstalledCodeException.java

@@ -29,5 +29,12 @@
  */
 public final class InvalidInstalledCodeException extends Exception {
 
+    public InvalidInstalledCodeException() {
+    }
+
+    public InvalidInstalledCodeException(String message) {
+        super(message);
+    }
+
     private static final long serialVersionUID = -3540232440794244844L;
 }

jvmci/jdk.vm.ci.common/snapshot.sigtest

@@ -80,14 +80,12 @@ intf java.lang.annotation.Annotation
 meth public abstract java.lang.annotation.ElementType[] value()
 
 CLSS public final jdk.vm.ci.common.InitTimer
-fld public final static java.lang.String SPACES = "                                            "
-fld public final static java.util.concurrent.atomic.AtomicInteger nesting
 intf java.lang.AutoCloseable
 meth public static jdk.vm.ci.common.InitTimer timer(java.lang.String)
 meth public static jdk.vm.ci.common.InitTimer timer(java.lang.String,java.lang.Object)
 meth public void close()
 supr java.lang.Object
-hfds ENABLED,initializingThread,name,start
+hfds SPACES,enabledPropertyValue,initializingThread,name,nesting,start
 
 CLSS public jdk.vm.ci.common.JVMCIError
 cons public !varargs init(java.lang.String,java.lang.Object[])

jvmci/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java

@@ -60,21 +60,32 @@ public void close() {
     }
 
     public static InitTimer timer(String name) {
-        return ENABLED ? new InitTimer(name) : null;
+        return isEnabled() ? new InitTimer(name) : null;
     }
 
     public static InitTimer timer(String name, Object suffix) {
-        return ENABLED ? new InitTimer(name + suffix) : null;
+        return isEnabled() ? new InitTimer(name + suffix) : null;
     }
 
     /**
-     * Specifies if initialization timing is enabled. Note: This property cannot use
+     * Determines if initialization timing is enabled. Note: This property cannot use
      * {@code HotSpotJVMCIRuntime.Option} since that class is not visible from this package.
      */
-    private static final boolean ENABLED = Boolean.getBoolean("jvmci.InitTimer");
+    private static boolean isEnabled() {
+        if (enabledPropertyValue == null) {
+            enabledPropertyValue = Boolean.getBoolean("jvmci.InitTimer");
+            nesting = new AtomicInteger();
+        }
+        return enabledPropertyValue;
+    }
+
+    /**
+     * Cache for value of {@code jvmci.InitTimer} system property.
+     */
+    @NativeImageReinitialize private static Boolean enabledPropertyValue;
 
-    public static final AtomicInteger nesting = ENABLED ? new AtomicInteger() : null;
-    public static final String SPACES = "                                            ";
+    private static AtomicInteger nesting;
+    private static final String SPACES = "                                            ";
 
     /**
      * Used to assert the invariant that all related initialization happens on the same thread.

jvmci/jdk.vm.ci.common/src/jdk/vm/ci/common/NativeImageReinitialize.java

@@ -30,7 +30,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Denotes a field that should have the default value for its type when building a native image.
+ * Denotes a field that should have the default value for its type in an ahead of time image.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD})

jvmci/jdk.vm.ci.hotspot.jfr/src/jdk/vm/ci/hotspot/jfr/events/JFREventProvider.java

@@ -22,6 +22,8 @@
  */
 package jdk.vm.ci.hotspot.jfr.events;
 
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+
 import java.net.URISyntaxException;
 
 import jdk.vm.ci.hotspot.EventProvider;
@@ -45,6 +47,11 @@ public static class Locator extends JVMCIServiceLocator {
 
         @Override
         public <S> S getProvider(Class<S> service) {
+            if (IS_IN_NATIVE_IMAGE) {
+                // Currently too many features unsupported by SVM such
+                // as Class.getDeclaredClasses0().
+                return null;
+            }
             if (service == EventProvider.class) {
                 return service.cast(new JFREventProvider());
             }
@@ -89,7 +96,7 @@ public JFREventProvider() {
      * Register an event class with the {@link com.oracle.jrockit.jfr.Producer}.
      *
      * @param c event class
-     * @return the {@link EventToken event token}
+     * @return the {@link com.oracle.jrockit.jfr.EventToken event token}
      */
     @SuppressWarnings({"javadoc", "unchecked"})
     private static com.oracle.jrockit.jfr.EventToken registerEvent(com.oracle.jrockit.jfr.Producer producer, Class<?> c) {