8229201: Update Graal

Reviewed-by: kvn

Author: dean-long

src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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

src/jdk.aot/share/classes/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -32,63 +32,62 @@
 
 package jdk.tools.jaotc.test;
 
-import jdk.tools.jaotc.utils.NativeOrderOutputStream;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-public class NativeOrderOutputStreamTest {
+import org.junit.Assert;
+import org.junit.Test;
 
-    private NativeOrderOutputStream target;
+import jdk.tools.jaotc.utils.NativeOrderOutputStream;
 
-    @Before
-    public void setup() {
-        target = new NativeOrderOutputStream();
-    }
+public class NativeOrderOutputStreamTest {
 
     @Test
     public void shouldAdd4BytesForInt() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.putInt(5);
         Assert.assertEquals(4, target.position());
     }
 
     @Test
     public void shouldAdd8BytesForLong() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.putLong(8);
         Assert.assertEquals(8, target.position());
     }
 
     @Test
     public void shouldHaveCorrectSizeBeforePatch() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.patchableInt();
         Assert.assertEquals(4, target.position());
     }
 
     @Test
     public void shouldHaveCorrectSizeAfterPatch() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         NativeOrderOutputStream.PatchableInt patchableInt = target.patchableInt();
         patchableInt.set(12);
         Assert.assertEquals(4, target.position());
     }
 
     @Test
     public void shouldSetCorrectValueInPatch() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         NativeOrderOutputStream.PatchableInt patchableInt = target.patchableInt();
         patchableInt.set(42);
-        Assert.assertEquals(42, getInt(0));
+        Assert.assertEquals(42, getInt(target, 0));
     }
 
-    private int getInt(int pos) {
+    private static int getInt(NativeOrderOutputStream target, int pos) {
         ByteBuffer buffer = ByteBuffer.wrap(target.array());
         buffer.order(ByteOrder.nativeOrder());
         return buffer.getInt(pos);
     }
 
     @Test
     public void shouldPutArrayCorrectly() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.put(new byte[]{42, 5, 43, 44});
         Assert.assertEquals(4, target.position());
         Assert.assertEquals(42, target.array()[0]);
@@ -97,25 +96,28 @@ public void shouldPutArrayCorrectly() {
 
     @Test
     public void shouldOnlyPatchSlot() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         NativeOrderOutputStream.PatchableInt patchableInt = target.patchableInt();
         target.putInt(7);
         patchableInt.set(39);
-        Assert.assertEquals(39, getInt(0));
-        Assert.assertEquals(7, getInt(4));
+        Assert.assertEquals(39, getInt(target, 0));
+        Assert.assertEquals(7, getInt(target, 4));
     }
 
     @Test
     public void shouldBeAbleToPatchAnywhere() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.putInt(19);
         NativeOrderOutputStream.PatchableInt patchableInt = target.patchableInt();
         patchableInt.set(242);
 
-        Assert.assertEquals(19, getInt(0));
-        Assert.assertEquals(242, getInt(4));
+        Assert.assertEquals(19, getInt(target, 0));
+        Assert.assertEquals(242, getInt(target, 4));
     }
 
     @Test
     public void shouldHavePatchableAtRightOffset() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.putInt(27);
         Assert.assertEquals(4, target.position());
         NativeOrderOutputStream.PatchableInt patchableInt = target.patchableInt();
@@ -124,6 +126,7 @@ public void shouldHavePatchableAtRightOffset() {
 
     @Test
     public void shouldAlign() {
+        NativeOrderOutputStream target = new NativeOrderOutputStream();
         target.putInt(9);
         target.align(16);
         target.put(new byte[]{3});

src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -40,6 +40,7 @@
 import jdk.tools.jaotc.collect.directory.DirectorySourceProvider;
 import jdk.tools.jaotc.collect.jar.JarSourceProvider;
 import jdk.tools.jaotc.collect.module.ModuleSourceProvider;
+import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -92,6 +93,7 @@ private void addMethod(AOTCompiledClass aotClass, ResolvedJavaMethod method, Com
         if (!main.filters.shouldCompileMethod(method)) {
             return;
         }
+        assert ((HotSpotResolvedObjectType) method.getDeclaringClass()).getFingerprint() != 0 : "no fingerprint for " + method.getDeclaringClass().getName();
 
         aotClass.addMethod(method);
         main.printer.printlnVerbose("  added " + method.getName() + method.getSignature().toMethodDescriptor());

src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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

src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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

src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalManagement.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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

src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalRuntimeMBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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

src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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

src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java

@@ -25,6 +25,7 @@
 package jdk.internal.vm.compiler.libgraal;
 
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.hotspot.HotSpotSpeculationLog;
 import jdk.vm.ci.services.Services;
 
 /**
@@ -36,6 +37,10 @@ public static boolean isAvailable() {
         return inLibGraal() || isolate != 0L;
     }
 
+    public static boolean isSupported() {
+        return true;
+    }
+
     public static boolean inLibGraal() {
         return Services.IS_IN_NATIVE_IMAGE;
     }
@@ -91,13 +96,17 @@ static boolean isCurrentThreadAttached(HotSpotJVMCIRuntime runtime) {
         return runtime.isCurrentThreadAttached();
     }
 
-    static boolean attachCurrentThread(HotSpotJVMCIRuntime runtime) {
-        return runtime.attachCurrentThread(false);
+    public static boolean attachCurrentThread(HotSpotJVMCIRuntime runtime, boolean isDaemon) {
+        return runtime.attachCurrentThread(isDaemon);
     }
 
-    static void detachCurrentThread(HotSpotJVMCIRuntime runtime) {
+    public static void detachCurrentThread(HotSpotJVMCIRuntime runtime) {
         runtime.detachCurrentThread();
     }
 
     static native long getCurrentIsolateThread(long iso);
+
+    public static long getFailedSpeculationsAddress(HotSpotSpeculationLog log) {
+        return log.getFailedSpeculationsAddress();
+    }
 }

src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalScope.java

@@ -77,7 +77,7 @@ public LibGraalScope(HotSpotJVMCIRuntime runtime) {
         parent = currentScope.get();
         boolean top = false;
         if (parent == null) {
-            top = LibGraal.attachCurrentThread(runtime);
+            top = LibGraal.attachCurrentThread(runtime, false);
             isolateThread = LibGraal.getCurrentIsolateThread(LibGraal.isolate);
         } else {
             isolateThread = parent.isolateThread;