From 1bbbb5f68bb3372ea62e61c9c8437f680906efaf Mon Sep 17 00:00:00 2001 From: tajila Date: Mon, 25 Jun 2018 15:25:30 -0400 Subject: [PATCH] Turn on nestmates spec Turn on nestmates flag and remove the optValhallaNestmates build definition. Signed-off-by: tajila --- ...ux_ppc-64_cmprssptrs_le_valhalla_nestmates | 52 ---- buildspecs/j9.flags | 4 - ...c-64_cmprssptrs_le_valhalla_nestmates.spec | 281 ------------------ runtime/include/j9cfg.h.ftl | 4 + runtime/include/j9cfg.h.in | 5 +- runtime/include/jvmti.h | 4 +- runtime/jcl/cl_se11/module.xml | 1 + runtime/jcl/uma/se11_exports.xml | 25 ++ runtime/jcl/uma/se9_exports.xml | 6 - runtime/shared_common/OSCache.cpp | 52 +--- runtime/shared_common/OSCacheFile.cpp | 48 +-- runtime/shared_common/OSCachesysv.cpp | 46 +-- 12 files changed, 49 insertions(+), 479 deletions(-) delete mode 100644 buildenv/jenkins/jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates delete mode 100644 buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec create mode 100644 runtime/jcl/uma/se11_exports.xml diff --git a/buildenv/jenkins/jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates b/buildenv/jenkins/jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates deleted file mode 100644 index b2b4ee56f16..00000000000 --- a/buildenv/jenkins/jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018, 2018 IBM Corp. and others - * - * This program and the accompanying materials are made available under - * the terms of the Eclipse Public License 2.0 which accompanies this - * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ - * or the Apache License, Version 2.0 which accompanies this distribution and - * is available at https://www.apache.org/licenses/LICENSE-2.0. - * - * This Source Code may also be made available under the following - * Secondary Licenses when the conditions for such availability set - * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU - * General Public License, version 2 with the GNU Classpath - * Exception [1] and GNU General Public License, version 2 with the - * OpenJDK Assembly Exception [2]. - * - * [1] https://www.gnu.org/software/classpath/license.html - * [2] http://openjdk.java.net/legal/assembly-exception.html - * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception - *******************************************************************************/ -// The SDK version and repository must be updated once the openj9-openjdk-jdk11 -// is available -SDK_VERSION = '10' -SPEC = 'linux_ppc-64_cmprssptrs_le_valhalla_nestmates' -TEST_TARGET = '_sanity' - -timeout(time: 10, unit: 'HOURS') { - node('master') { - retry(5){ - checkout scm - } - variableFile = load 'buildenv/jenkins/common/variables-functions' - variableFile.set_job_variables('pullRequest') - cleanWs() - } - - node("${NODE}") { - checkout scm - buildfile = load 'buildenv/jenkins/common/build' - testfile = load 'buildenv/jenkins/common/test' - cleanWs() - - // Build - buildfile.build_pr() - - // Test - testfile.test_all() - - cleanWs() - } -} diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags index 22579a3b9b8..d46e3d25bc4 100644 --- a/buildspecs/j9.flags +++ b/buildspecs/j9.flags @@ -2072,10 +2072,6 @@ Only available on zOS Enables support for Project Valhalla L-World Value Types No support for Project Valhalla L-World Value Types - - Enables support for Project Valhalla Nest Mates - No support for Project Valhalla Nest Mates - Support for PHP interpreter. No support for PHP. diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec b/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec deleted file mode 100644 index 8edda7bd96f..00000000000 --- a/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec +++ /dev/null @@ -1,281 +0,0 @@ - - - - Linux PPC LE 64bit Compressed Pointers Valhalla Nestmates - LinuxPPC64LE - ppc - linux - Sidecar - desktop (256M + big OS stack) - 150 - - Talia.McCormick@ibm.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runtime/include/j9cfg.h.ftl b/runtime/include/j9cfg.h.ftl index 4dc64686a38..abd626e9335 100644 --- a/runtime/include/j9cfg.h.ftl +++ b/runtime/include/j9cfg.h.ftl @@ -57,6 +57,10 @@ extern "C" { +#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 index 7075e7e83d1..0d18d70b41b 100644 --- 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 index cd1016ef3e2..b9bb08f5941 100644 --- 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 index 831fc812cf6..29ac570b4f0 100644 --- a/runtime/jcl/cl_se11/module.xml +++ b/runtime/jcl/cl_se11/module.xml @@ -34,6 +34,7 @@ + diff --git a/runtime/jcl/uma/se11_exports.xml b/runtime/jcl/uma/se11_exports.xml new file mode 100644 index 00000000000..71008ee28ed --- /dev/null +++ b/runtime/jcl/uma/se11_exports.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/runtime/jcl/uma/se9_exports.xml b/runtime/jcl/uma/se9_exports.xml index ca96f3102cf..451f41e865f 100644 --- a/runtime/jcl/uma/se9_exports.xml +++ b/runtime/jcl/uma/se9_exports.xml @@ -20,12 +20,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception --> - - - - - - diff --git a/runtime/shared_common/OSCache.cpp b/runtime/shared_common/OSCache.cpp index 1170897a207..3627eb826dd 100644 --- a/runtime/shared_common/OSCache.cpp +++ b/runtime/shared_common/OSCache.cpp @@ -954,39 +954,7 @@ SH_OSCache::getHeaderFieldAddressForGen(void* header, UDATA headerGen, UDATA fie IDATA SH_OSCache::getHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) { - switch(headerGen) { - case OSCACHE_CURRENT_CACHE_GEN : - case 34: - case 33: - case 32: - case 31: - case 30: - case 29: - case 28: - case 27: - case 26: - case 25: - case 24: - case 23: - case 22: - case 21: - case 20: - case 19: - case 18: - case 17: - case 16: - case 15: - case 14: - case 13: - case 12: - case 11: - case 10: - case 9 : - case 8 : - case 7 : - case 6 : - case 5 : - { + if ((4 < headerGen) && (headerGen <= OSCACHE_CURRENT_CACHE_GEN)) { switch (fieldID) { case OSCACHE_HEADER_FIELD_SIZE : return offsetof(OSCache_header_version_current, size); @@ -1001,12 +969,10 @@ SH_OSCache::getHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) case OSCACHE_HEADER_FIELD_CACHE_INIT_COMPLETE : return offsetof(OSCache_header_version_current, cacheInitComplete); default : - break; /* Should never happen */ + break; } - } - case 4 : - { + } else if (4 == headerGen) { switch (fieldID) { case OSCACHE_HEADER_FIELD_SIZE : return offsetof(OSCache_header_version_G04, size); @@ -1021,12 +987,10 @@ SH_OSCache::getHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) case OSCACHE_HEADER_FIELD_CACHE_INIT_COMPLETE : return offsetof(OSCache_header_version_G04, cacheInitComplete); default : - break; /* Should never happen */ + break; } - } - case 3 : - { + } else if (3 == headerGen) { switch (fieldID) { case OSCACHE_HEADER_FIELD_SIZE : return offsetof(OSCache_header_version_G03, size); @@ -1039,14 +1003,10 @@ SH_OSCache::getHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) case OSCACHE_HEADER_FIELD_BUILDID : return offsetof(OSCache_header_version_G03, buildID); default : - break; /* Should never happen */ + break; } } - default : - break; - /* Should never happen */ - } Trc_SHR_Assert_ShouldNeverHappen(); return 0; } diff --git a/runtime/shared_common/OSCacheFile.cpp b/runtime/shared_common/OSCacheFile.cpp index 5804e011eda..9e5928cee19 100644 --- a/runtime/shared_common/OSCacheFile.cpp +++ b/runtime/shared_common/OSCacheFile.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2014 IBM Corp. and others + * Copyright (c) 2001, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -456,39 +456,7 @@ SH_OSCacheFile::getMmapHeaderFieldAddressForGen(void* header, UDATA headerGen, U IDATA SH_OSCacheFile::getMmapHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) { - switch(headerGen) { - case OSCACHE_CURRENT_CACHE_GEN : - case 34: - case 33: - case 32: - case 31: - case 30: - case 29: - case 28: - case 27: - case 26: - case 25: - case 24: - case 23: - case 22: - case 21: - case 20: - case 19: - case 18: - case 17: - case 16: - case 15: - case 14: - case 13: - case 12: - case 11: - case 10: - case 9 : - case 8 : - case 7 : - case 6 : - case 5 : - { + if ((4 < headerGen) && (headerGen <= OSCACHE_CURRENT_CACHE_GEN)) { switch (fieldID) { case OSCACHEMMAP_HEADER_FIELD_CREATE_TIME : return offsetof(OSCachemmap_header_version_current, createTime); @@ -511,9 +479,7 @@ SH_OSCacheFile::getMmapHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) } } } - } - case 4 : - { + } else if (4 == headerGen) { switch (fieldID) { case OSCACHEMMAP_HEADER_FIELD_CREATE_TIME : return offsetof(OSCachemmap_header_version_G04, createTime); @@ -536,9 +502,7 @@ SH_OSCacheFile::getMmapHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) } } } - } - case 3 : - { + } else if (3 == headerGen) { switch (fieldID) { case OSCACHEMMAP_HEADER_FIELD_CREATE_TIME : return offsetof(OSCachemmap_header_version_G03, createTime); @@ -564,10 +528,6 @@ SH_OSCacheFile::getMmapHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) } } } - default : - break; - /* Should never happen */ - } Trc_SHR_Assert_ShouldNeverHappen(); return 0; } diff --git a/runtime/shared_common/OSCachesysv.cpp b/runtime/shared_common/OSCachesysv.cpp index 2e208802e5b..6b2c67f821c 100644 --- a/runtime/shared_common/OSCachesysv.cpp +++ b/runtime/shared_common/OSCachesysv.cpp @@ -1909,57 +1909,21 @@ SH_OSCachesysv::getSysvHeaderFieldAddressForGen(void* header, UDATA headerGen, U IDATA SH_OSCachesysv::getSysvHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) { - switch(headerGen) { - case OSCACHE_CURRENT_CACHE_GEN : - case 34: - case 33: - case 32: - case 31: - case 30: - case 29: - case 28: - case 27: - case 26: - case 25: - case 24: - case 23: - case 22: - case 21: - case 20: - case 19: - case 18: - case 17: - case 16: - case 15: - case 14: - case 13: - case 12: - case 11: - case 10: - case 9 : - case 8 : - case 7 : - case 6 : - case 5 : - { + if ((4 < headerGen) && (headerGen <= OSCACHE_CURRENT_CACHE_GEN)) { switch (fieldID) { case OSCACHESYSV_HEADER_FIELD_IN_DEFAULT_CONTROL_DIR : return offsetof(OSCachesysv_header_version_current, inDefaultControlDir); default : return offsetof(OSCachesysv_header_version_current, oscHdr) + getHeaderFieldOffsetForGen(headerGen, fieldID); } - } - case 4 : - { + } else if (4 == headerGen) { switch (fieldID) { case OSCACHESYSV_HEADER_FIELD_IN_DEFAULT_CONTROL_DIR : return offsetof(OSCachesysv_header_version_G04, inDefaultControlDir); default : return offsetof(OSCachesysv_header_version_G04, oscHdr) + getHeaderFieldOffsetForGen(headerGen, fieldID); } - } - case 3 : - { + } else if (3 == headerGen) { switch (fieldID) { case OSCACHESYSV_HEADER_FIELD_IN_DEFAULT_CONTROL_DIR : return offsetof(OSCachesysv_header_version_G03, inDefaultControlDir); @@ -1969,10 +1933,6 @@ SH_OSCachesysv::getSysvHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID) return offsetof(OSCachesysv_header_version_G03, oscHdr) + getHeaderFieldOffsetForGen(headerGen, fieldID); } } - default : - break; - /* Should never happen */ - } Trc_SHR_Assert_ShouldNeverHappen(); return 0; }