[9] RFR(M) 8166416: [AOT] Integrate JDK build changes and launcher 'jaotc' for AOT compiler

[Andrew Dinn]

Hi Vladimir,

On 28/10/16 16:52, Vladimir Kozlov wrote:
> Thank you, Andrew, for verifying that build changes do not break AArch64.
> But it would be nice if you can also apply Hotspot changes (revert
> hs.make.webrev changes before that since hs.webrev have them):
> 
> http://cr.openjdk.java.net/~kvn/aot/hs.webrev/
> 
> and jaotc sources (which are located in Hotspot repo):
> 
> http://cr.openjdk.java.net/~kvn/aot/jaotc.webrev/

I tried this and found two missing changes to compiledIC_aarch64.cpp
(basically a missing arg in each of two class to find_stub() -- see
below for diff).

However, I then ran into the problem Volker saw:

Compiling 15 files for jdk.attach
/home/adinn/openjdk/hs/hotspot/src/jdk.vm.ci/share/classes/module-info.java:40:
error: module not found: jdk.vm.compiler
       jdk.vm.compiler;
             ^
/home/adinn/openjdk/hs/hotspot/src/jdk.vm.ci/share/classes/module-info.java:43:
error: module not found: jdk.vm.compiler
       jdk.vm.compiler;

. . .

I assume fixing this second problem requires me to clone the graal-core
repo into my tree and the apply the graal.webrev patch then rebuild.

I am currently looking into that.

regards,


Andrew Dinn
-----------
Senior Principal Software Engineer
Red Hat UK Ltd
Registered in England and Wales under Company Registration No. 03798903
Directors: Michael Cunningham, Michael ("Mike") O'Neill, Eric Shander

----- 8< -------- 8< -------- 8< -------- 8< -------- 8< -------- 8< ---
diff -r 234ce47a2f3f src/cpu/aarch64/vm/compiledIC_aarch64.cpp
--- a/src/cpu/aarch64/vm/compiledIC_aarch64.cpp	Mon Oct 31 04:54:01 2016
-0400
+++ b/src/cpu/aarch64/vm/compiledIC_aarch64.cpp	Mon Oct 31 07:16:47 2016
-0400
@@ -77,7 +77,7 @@
 }

 void CompiledDirectStaticCall::set_to_interpreted(methodHandle callee,
address entry) {
-  address stub = find_stub();
+  address stub = find_stub(false /* is_aot */);
   guarantee(stub != NULL, "stub not found");

   if (TraceICs) {
@@ -129,7 +129,7 @@
   }

   // Verify stub.
-  address stub = find_stub();
+  address stub = find_stub(false /* is_aot */);
   assert(stub != NULL, "no stub found for static call");
   // Creation also verifies the object.
   NativeMovConstReg* method_holder = nativeMovConstReg_at(stub);