Merge pull request #2270 from tajila/nestmates1

Turn on nestmates spec
eclipse-openj9 · Jul 10, 2018 · 7336f3a · 7336f3a
2 parents 4604842 + 1bbbb5f
commit 7336f3a
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 479 deletions.
diff --git a/...jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates b/...jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates
diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags
@@ -2072,10 +2072,6 @@ Only available on zOS</description>
 		<description>Enables support for Project Valhalla L-World Value Types</description>
 		<ifRemoved>No support for Project Valhalla L-World Value Types</ifRemoved>
 	</flag>
-	<flag id="opt_valhallaNestmates">
-		<description>Enables support for Project Valhalla Nest Mates</description>
-		<ifRemoved>No support for Project Valhalla Nest Mates</ifRemoved>
-	</flag>
 	<flag id="opt_phpSupport">
 		<description>Support for PHP interpreter.</description>
 		<ifRemoved>No support for PHP.</ifRemoved>

diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec b/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec
diff --git a/runtime/include/j9cfg.h.ftl b/runtime/include/j9cfg.h.ftl
@@ -57,6 +57,10 @@ extern "C" {
 </#if>
 </#list>
 
+#if JAVA_SPEC_VERSION >= 11
+#define J9VM_OPT_VALHALLA_NESTMATES
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/runtime/include/j9cfg.h.in b/runtime/include/j9cfg.h.in
@@ -251,7 +251,6 @@ extern "C" {
 #cmakedefine J9VM_OPT_USE_FFI
 #cmakedefine J9VM_OPT_USE_FFI_ONLY
 #cmakedefine J9VM_OPT_VALHALLA_MVT
-#cmakedefine J9VM_OPT_VALHALLA_NESTMATES
 #cmakedefine J9VM_OPT_VEE_SUPPORT
 #cmakedefine J9VM_OPT_VM_LOCAL_STORAGE
 #cmakedefine J9VM_OPT_ZERO
@@ -283,6 +282,10 @@ extern "C" {
 #cmakedefine J9VM_THR_PREEMPTIVE
 #cmakedefine J9VM_THR_SMART_DEFLATION
 
+#if JAVA_SPEC_VERSION >= 11
+#define J9VM_OPT_VALHALLA_NESTMATES
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/runtime/include/jvmti.h b/runtime/include/jvmti.h
@@ -340,9 +340,9 @@ typedef enum jvmtiError {
 	JVMTI_ERROR_NAMES_DONT_MATCH = 69,
 	JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70,
 	JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71,
-#if defined(J9VM_OPT_VALHALLA_NESTMATES)
+/* #if defined(J9VM_OPT_VALHALLA_NESTMATES) */
 	JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_ATTRIBUTE_CHANGED = 72,
-#endif /* defined(J9VM_OPT_VALHALLA_NESTMATES) */
+/* #endif defined(J9VM_OPT_VALHALLA_NESTMATES) */
 	JVMTI_ERROR_UNMODIFIABLE_CLASS = 79,
 	JVMTI_ERROR_UNMODIFIABLE_MODULE = 80,
 	JVMTI_ERROR_NOT_AVAILABLE = 98,

diff --git a/runtime/jcl/cl_se11/module.xml b/runtime/jcl/cl_se11/module.xml
@@ -34,6 +34,7 @@
 	<xi:include href="../uma/se8_exports.xml"></xi:include>
 	<xi:include href="../uma/se829_exports.xml"></xi:include>
 	<xi:include href="../uma/se9_exports.xml"></xi:include>
+	<xi:include href="../uma/se11_exports.xml"></xi:include>
 
 	<xi:include href="../uma/vendor_jcl_exports.xml">
 		<xi:fallback/>