RFR 8203285: Minimal VM fails to build after JDK-8199712 (Flight Recorder)

[Markus Gronlund]

Looks good. 

Thank you very much for fixing this.

Markus

-----Original Message-----
From: Aleksey Shipilev [mailto:shade at redhat.com] 
Sent: den 16 maj 2018 12:58
To: hotspot-dev at openjdk.java.net
Subject: RFR 8203285: Minimal VM fails to build after JDK-8199712 (Flight Recorder)

JFR is not supported for Minimal VM, but it still fails to build.

Bug (with build failure examples):
  https://bugs.openjdk.java.net/browse/JDK-8203285

Testing: minimal build, x86_64 build

Fix:

diff -r f222eba39694 src/hotspot/share/jfr/metadata/GenerateJfrFiles.java
--- a/src/hotspot/share/jfr/metadata/GenerateJfrFiles.java	Wed May 16 12:38:35 2018 +0200
+++ b/src/hotspot/share/jfr/metadata/GenerateJfrFiles.java	Wed May 16 12:55:34 2018 +0200
@@ -450,6 +450,7 @@
             out.write("#ifndef JFRFILES_JFREVENTCLASSES_HPP");
             out.write("#define JFRFILES_JFREVENTCLASSES_HPP");
             out.write("");
+            out.write("#include \"oops/klass.hpp\"");
             out.write("#include \"jfrfiles/jfrTypes.hpp\"");
             out.write("#include \"jfr/utilities/jfrTypes.hpp\"");
             out.write("#include \"utilities/macros.hpp\""); @@ -689,4 +690,4 @@
     private static void printField(Printer out, FieldElement field) {
         out.write("  " + field.getFieldType() + " _" + field.name + ";");
     }
-}
\ No newline at end of file
+}
diff -r f222eba39694 src/hotspot/share/jfr/support/jfrThreadId.hpp
--- a/src/hotspot/share/jfr/support/jfrThreadId.hpp	Wed May 16 12:38:35 2018 +0200
+++ b/src/hotspot/share/jfr/support/jfrThreadId.hpp	Wed May 16 12:55:34 2018 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP

 #include "utilities/macros.hpp"
+#include "utilities/globalDefinitions.hpp"

 #if INCLUDE_JFR
 #include "jfr/support/jfrThreadLocal.hpp"
diff -r f222eba39694 src/hotspot/share/runtime/java.cpp
--- a/src/hotspot/share/runtime/java.cpp	Wed May 16 12:38:35 2018 +0200
+++ b/src/hotspot/share/runtime/java.cpp	Wed May 16 12:55:34 2018 +0200
@@ -32,6 +32,7 @@
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "jfr/support/jfrThreadId.hpp"
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciCompiler.hpp"

Thanks,
-Aleksey