OpenJDK / aarch32-port / jdk9-arm3264 / hotspot
changeset 11886:7c52bc363c21
Merge
| author | iveresov |
|---|---|
| date | Fri, 19 Aug 2016 14:35:15 -0700 |
| parents | e0a8f4132724 c3f20f5f5876 |
| children | 89151398365e |
| files | test/runtime/modules/Visibility/XpatchVisibility.java test/runtime/modules/Xpatch/BasicJarBuilder.java test/runtime/modules/Xpatch/Xpatch2Dirs.java test/runtime/modules/Xpatch/Xpatch2DirsMain.java test/runtime/modules/Xpatch/XpatchDupJavaBase.java test/runtime/modules/Xpatch/XpatchDupModule.java test/runtime/modules/Xpatch/XpatchJavaBase.java test/runtime/modules/Xpatch/XpatchMain.java test/runtime/modules/Xpatch/XpatchTest.java test/runtime/modules/Xpatch/XpatchTestJar.java test/runtime/modules/Xpatch/XpatchTestJarDir.java test/runtime/modules/Xpatch/XpatchTraceCL.java test/runtime/modules/XpatchCDS.java test/testlibrary/ClassFileInstaller.java test/testlibrary/RedefineClassHelper.java test/testlibrary/jdk/test/lib/AllocationHelper.java test/testlibrary/jdk/test/lib/Asserts.java test/testlibrary/jdk/test/lib/BuildHelper.java test/testlibrary/jdk/test/lib/ByteCodeLoader.java test/testlibrary/jdk/test/lib/DynamicVMOption.java test/testlibrary/jdk/test/lib/ExitCode.java test/testlibrary/jdk/test/lib/FileInstaller.java test/testlibrary/jdk/test/lib/HeapRegionUsageTool.java test/testlibrary/jdk/test/lib/InMemoryJavaCompiler.java test/testlibrary/jdk/test/lib/InfiniteLoop.java test/testlibrary/jdk/test/lib/InputArguments.java test/testlibrary/jdk/test/lib/JDKToolFinder.java test/testlibrary/jdk/test/lib/JDKToolLauncher.java test/testlibrary/jdk/test/lib/OutputAnalyzer.java test/testlibrary/jdk/test/lib/OutputBuffer.java test/testlibrary/jdk/test/lib/Pair.java test/testlibrary/jdk/test/lib/Platform.java test/testlibrary/jdk/test/lib/ProcessTools.java test/testlibrary/jdk/test/lib/StreamPumper.java test/testlibrary/jdk/test/lib/TimeLimitedRunner.java test/testlibrary/jdk/test/lib/Triple.java test/testlibrary/jdk/test/lib/Utils.java test/testlibrary/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java test/testlibrary/jdk/test/lib/cli/CommandLineOptionTest.java test/testlibrary/jdk/test/lib/cli/predicate/AndPredicate.java test/testlibrary/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java test/testlibrary/jdk/test/lib/cli/predicate/NotPredicate.java test/testlibrary/jdk/test/lib/cli/predicate/OrPredicate.java test/testlibrary/jdk/test/lib/dcmd/CommandExecutor.java test/testlibrary/jdk/test/lib/dcmd/CommandExecutorException.java test/testlibrary/jdk/test/lib/dcmd/FileJcmdExecutor.java test/testlibrary/jdk/test/lib/dcmd/JMXExecutor.java test/testlibrary/jdk/test/lib/dcmd/JcmdExecutor.java test/testlibrary/jdk/test/lib/dcmd/MainClassJcmdExecutor.java test/testlibrary/jdk/test/lib/dcmd/PidJcmdExecutor.java test/testlibrary/jdk/test/lib/dtrace/DtraceResultsAnalyzer.java test/testlibrary/jdk/test/lib/dtrace/DtraceRunner.java |
| diffstat | 1058 files changed, 5223 insertions(+), 9625 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Aug 19 08:34:30 2016 +0200 +++ b/.hgtags Fri Aug 19 14:35:15 2016 -0700 @@ -533,3 +533,4 @@ 22bf6db9767b1b3a1994cbf32eb3331f31ae2093 jdk-9+128 e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129 7d54c7056328b6a2bf4877458b8f4d8cd870f93b jdk-9+130 +943bf73b49c33c2d7cbd796f6a4ae3c7a00ae932 jdk-9+131
--- a/make/Dist.gmk Fri Aug 19 08:34:30 2016 +0200 +++ b/make/Dist.gmk Fri Aug 19 14:35:15 2016 -0700 @@ -46,15 +46,6 @@ endif ################################################################################ -# Functions to setup copying of files for variants - -# Support macro for SetupDistLibFile -define macosx_universalize - $(MKDIR) -p $(@D) - $(LIPO) -create -output $@ $< -endef - -################################################################################ # Setup make rules to copy a native library and associated data. # # Parameter 1 is the name of the rule. This name is used as variable prefix, @@ -74,16 +65,9 @@ $1_LIB_NAME := $(LIBRARY_PREFIX)$$($1_NAME) $1_TARGET_DIR := $$(DIST_OUTPUTDIR)/$$(LIB_SUBDIR)/$$($1_VARIANT_TARGET_DIR) - ifeq ($(OPENJDK_TARGET_OS), macosx) - # We must use the 'universalize' macro to run lipo on shared libraries, at - # least until JDK-8069540 is fixed. - $1_MACRO := macosx_universalize - endif - # Copy the the native library. $$(eval $$(call SetupCopyFiles, $1_COPY_LIB, \ DEST := $$($1_TARGET_DIR), \ - MACRO := $$($1_MACRO), \ FILES := $$(wildcard \ $$($1_SRC_DIR)/$$($1_LIB_NAME)$(SHARED_LIBRARY_SUFFIX)), \ ))
--- a/make/test/JtregNative.gmk Fri Aug 19 08:34:30 2016 +0200 +++ b/make/test/JtregNative.gmk Fri Aug 19 14:35:15 2016 -0700 @@ -71,15 +71,15 @@ endif ifeq ($(TOOLCHAIN_TYPE), solstudio) - BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_liboverflow := -lc - BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libSimpleClassFileLoadHook := -lc - BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libGetNamedModuleTest := -lc + BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liboverflow := -lc + BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSimpleClassFileLoadHook := -lc + BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetNamedModuleTest := -lc endif ifeq ($(OPENJDK_TARGET_OS), linux) BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack - BUILD_HOTSPOT_JTREG_EXECUTABLES_LDFLAGS_exeinvoke := -ljvm -lpthread + BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := -ljvm -lpthread BUILD_TEST_invoke_exeinvoke.c_OPTIMIZATION := NONE endif
--- a/src/cpu/aarch64/vm/templateTable_aarch64.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/cpu/aarch64/vm/templateTable_aarch64.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -852,26 +852,23 @@ // get next bytecode __ load_unsigned_byte(r1, at_bcp(Bytecodes::length_for(Bytecodes::_aload_0))); - // do actual aload_0 - aload(0); - // if _getfield then wait with rewrite __ cmpw(r1, Bytecodes::Bytecodes::_getfield); __ br(Assembler::EQ, done); - // if _igetfield then reqrite to _fast_iaccess_0 + // if _igetfield then rewrite to _fast_iaccess_0 assert(Bytecodes::java_code(Bytecodes::_fast_iaccess_0) == Bytecodes::_aload_0, "fix bytecode definition"); __ cmpw(r1, Bytecodes::_fast_igetfield); __ movw(bc, Bytecodes::_fast_iaccess_0); __ br(Assembler::EQ, rewrite); - // if _agetfield then reqrite to _fast_aaccess_0 + // if _agetfield then rewrite to _fast_aaccess_0 assert(Bytecodes::java_code(Bytecodes::_fast_aaccess_0) == Bytecodes::_aload_0, "fix bytecode definition"); __ cmpw(r1, Bytecodes::_fast_agetfield); __ movw(bc, Bytecodes::_fast_aaccess_0); __ br(Assembler::EQ, rewrite); - // if _fgetfield then reqrite to _fast_faccess_0 + // if _fgetfield then rewrite to _fast_faccess_0 assert(Bytecodes::java_code(Bytecodes::_fast_faccess_0) == Bytecodes::_aload_0, "fix bytecode definition"); __ cmpw(r1, Bytecodes::_fast_fgetfield); __ movw(bc, Bytecodes::_fast_faccess_0); @@ -887,9 +884,10 @@ patch_bytecode(Bytecodes::_aload_0, bc, r1, false); __ bind(done); - } else { - aload(0); } + + // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop). + aload(0); } void TemplateTable::istore()
--- a/src/cpu/sparc/vm/templateTable_sparc.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/cpu/sparc/vm/templateTable_sparc.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -705,9 +705,6 @@ // get next byte __ ldub(at_bcp(Bytecodes::length_for(Bytecodes::_aload_0)), G3_scratch); - // do actual aload_0 - aload(0); - // if _getfield then wait with rewrite __ cmp_and_br_short(G3_scratch, (int)Bytecodes::_getfield, Assembler::equal, Assembler::pn, done); @@ -738,9 +735,10 @@ __ bind(rewrite); patch_bytecode(Bytecodes::_aload_0, G4_scratch, G3_scratch, false); __ bind(done); - } else { - aload(0); } + + // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop). + aload(0); } void TemplateTable::istore() {
--- a/src/cpu/x86/vm/interp_masm_x86.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/cpu/x86/vm/interp_masm_x86.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -1071,6 +1071,9 @@ NOT_LP64(get_thread(rthread);) + cmpl(Address(rthread, JavaThread::stack_guard_state_offset()), JavaThread::stack_guard_enabled); + jcc(Assembler::equal, no_reserved_zone_enabling); + cmpptr(rbx, Address(rthread, JavaThread::reserved_stack_activation_offset())); jcc(Assembler::lessEqual, no_reserved_zone_enabling);
--- a/src/cpu/x86/vm/templateTable_x86.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/cpu/x86/vm/templateTable_x86.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, 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 @@ -858,26 +858,23 @@ // get next byte __ load_unsigned_byte(rbx, at_bcp(Bytecodes::length_for(Bytecodes::_aload_0))); - // do actual aload_0 - aload(0); - // if _getfield then wait with rewrite __ cmpl(rbx, Bytecodes::_getfield); __ jcc(Assembler::equal, done); - // if _igetfield then reqrite to _fast_iaccess_0 + // if _igetfield then rewrite to _fast_iaccess_0 assert(Bytecodes::java_code(Bytecodes::_fast_iaccess_0) == Bytecodes::_aload_0, "fix bytecode definition"); __ cmpl(rbx, Bytecodes::_fast_igetfield); __ movl(bc, Bytecodes::_fast_iaccess_0); __ jccb(Assembler::equal, rewrite); - // if _agetfield then reqrite to _fast_aaccess_0 + // if _agetfield then rewrite to _fast_aaccess_0 assert(Bytecodes::java_code(Bytecodes::_fast_aaccess_0) == Bytecodes::_aload_0, "fix bytecode definition"); __ cmpl(rbx, Bytecodes::_fast_agetfield); __ movl(bc, Bytecodes::_fast_aaccess_0); __ jccb(Assembler::equal, rewrite); - // if _fgetfield then reqrite to _fast_faccess_0 + // if _fgetfield then rewrite to _fast_faccess_0 assert(Bytecodes::java_code(Bytecodes::_fast_faccess_0) == Bytecodes::_aload_0, "fix bytecode definition"); __ cmpl(rbx, Bytecodes::_fast_fgetfield); __ movl(bc, Bytecodes::_fast_faccess_0); @@ -893,9 +890,10 @@ patch_bytecode(Bytecodes::_aload_0, bc, rbx, false); __ bind(done); - } else { - aload(0); } + + // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop). + aload(0); } void TemplateTable::istore() {
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java Fri Aug 19 08:34:30 2016 +0200 +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java Fri Aug 19 14:35:15 2016 -0700 @@ -255,7 +255,8 @@ } buildAttachArgs(newArgs, pid, exe, core, false); - JStack.main(newArgs.toArray(new String[newArgs.size()])); + JStack jstack = new JStack(false, false); + jstack.runWithArgs(newArgs.toArray(new String[newArgs.size()])); } private static void runJMAP(String[] oldArgs) {
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java Fri Aug 19 08:34:30 2016 +0200 +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java Fri Aug 19 14:35:15 2016 -0700 @@ -32,6 +32,7 @@ import sun.jvm.hotspot.types.Type; import sun.jvm.hotspot.types.TypeDataBase; import sun.jvm.hotspot.utilities.Assert; +import sun.jvm.hotspot.utilities.CStringUtilities; import java.io.PrintStream; import java.util.Observable; @@ -115,7 +116,7 @@ } public String getName() { - return getName(); + return CStringUtilities.getString(nameField.getValue(addr)); } /** OopMap for frame; can return null if none available */
--- a/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java Fri Aug 19 08:34:30 2016 +0200 +++ b/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java Fri Aug 19 14:35:15 2016 -0700 @@ -109,6 +109,9 @@ if (!s.getReturnType(CLASS).equals(resultType)) { return false; } + if (s.getParameterCount(false) != parameterTypes.length) { + return false; + } for (int i = 0; i < s.getParameterCount(false); ++i) { if (!s.getParameterType(i, CLASS).equals(parameterTypes[i])) { return false;
--- a/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java Fri Aug 19 08:34:30 2016 +0200 +++ b/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java Fri Aug 19 14:35:15 2016 -0700 @@ -57,7 +57,7 @@ if (jvmci != requestorModule) { for (String pkg : jvmci.getPackages()) { // Export all JVMCI packages dynamically instead - // of requiring a long list of -XaddExports + // of requiring a long list of --add-exports // options on the JVM command line. if (!jvmci.isExported(pkg, requestorModule)) { jvmci.addExports(pkg, requestorModule);
--- a/src/os/aix/vm/attachListener_aix.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/aix/vm/attachListener_aix.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -494,7 +494,7 @@ if (ret == 0) { ret = ::unlink(fn); if (ret == -1) { - debug_only(warning("failed to remove stale attach pid file at %s", fn)); + log_debug(attach)("Failed to remove stale attach pid file at %s", fn); } } } @@ -537,16 +537,23 @@ struct stat64 st; RESTARTABLE(::stat64(fn, &st), ret); if (ret == -1) { + log_trace(attach)("Failed to find attach file: %s, trying alternate", fn); snprintf(fn, sizeof(fn), "%s/.attach_pid%d", os::get_temp_directory(), os::current_process_id()); RESTARTABLE(::stat64(fn, &st), ret); + if (ret == -1) { + log_debug(attach)("Failed to find attach file: %s", fn); + } } if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file if (st.st_uid == geteuid()) { init(); + log_trace(attach)("Attach trigerred by %s", fn); return true; + } else { + log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not triggered", fn, st.st_uid, geteuid()); } } return false;
--- a/src/os/aix/vm/os_aix.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/aix/vm/os_aix.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -2686,7 +2686,8 @@ // - sets target osthread state to continue // - sends signal to end the sigsuspend loop in the SR_handler // -// Note that the SR_lock plays no role in this suspend/resume protocol. +// Note that the SR_lock plays no role in this suspend/resume protocol, +// but is checked for NULL in SR_handler as a thread termination indicator. // static void resume_clear_context(OSThread *osthread) { @@ -2718,9 +2719,22 @@ // after sigsuspend. int old_errno = errno; - Thread* thread = Thread::current(); + Thread* thread = Thread::current_or_null_safe(); + assert(thread != NULL, "Missing current thread in SR_handler"); + + // On some systems we have seen signal delivery get "stuck" until the signal + // mask is changed as part of thread termination. Check that the current thread + // has not already terminated (via SR_lock()) - else the following assertion + // will fail because the thread is no longer a JavaThread as the ~JavaThread + // destructor has completed. + + if (thread->SR_lock() == NULL) { + return; + } + + assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread"); + OSThread* osthread = thread->osthread(); - assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread"); os::SuspendResume::State current = osthread->sr.state(); if (current == os::SuspendResume::SR_SUSPEND_REQUEST) {
--- a/src/os/bsd/vm/attachListener_bsd.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/bsd/vm/attachListener_bsd.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -456,7 +456,7 @@ if (ret == 0) { ret = ::unlink(fn); if (ret == -1) { - debug_only(warning("failed to remove stale attach pid file at %s", fn)); + log_debug(attach)("Failed to remove stale attach pid file at %s", fn); } } } @@ -493,19 +493,25 @@ if (init_at_startup() || is_initialized()) { return false; // initialized at startup or already initialized } - char path[PATH_MAX + 1]; + char fn[PATH_MAX + 1]; int ret; struct stat st; - snprintf(path, PATH_MAX + 1, "%s/.attach_pid%d", + snprintf(fn, PATH_MAX + 1, "%s/.attach_pid%d", os::get_temp_directory(), os::current_process_id()); - RESTARTABLE(::stat(path, &st), ret); + RESTARTABLE(::stat(fn, &st), ret); + if (ret == -1) { + log_debug(attach)("Failed to find attach file: %s", fn); + } if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file if (st.st_uid == geteuid()) { init(); + log_trace(attach)("Attach trigerred by %s", fn); return true; + } else { + log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not triggered", fn, st.st_uid, geteuid()); } } return false;
--- a/src/os/bsd/vm/os_bsd.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/bsd/vm/os_bsd.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -2716,7 +2716,8 @@ // - sets target osthread state to continue // - sends signal to end the sigsuspend loop in the SR_handler // -// Note that the SR_lock plays no role in this suspend/resume protocol. +// Note that the SR_lock plays no role in this suspend/resume protocol, +// but is checked for NULL in SR_handler as a thread termination indicator. static void resume_clear_context(OSThread *osthread) { osthread->set_ucontext(NULL); @@ -2746,9 +2747,22 @@ // after sigsuspend. int old_errno = errno; - Thread* thread = Thread::current(); + Thread* thread = Thread::current_or_null_safe(); + assert(thread != NULL, "Missing current thread in SR_handler"); + + // On some systems we have seen signal delivery get "stuck" until the signal + // mask is changed as part of thread termination. Check that the current thread + // has not already terminated (via SR_lock()) - else the following assertion + // will fail because the thread is no longer a JavaThread as the ~JavaThread + // destructor has completed. + + if (thread->SR_lock() == NULL) { + return; + } + + assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread"); + OSThread* osthread = thread->osthread(); - assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread"); os::SuspendResume::State current = osthread->sr.state(); if (current == os::SuspendResume::SR_SUSPEND_REQUEST) {
--- a/src/os/linux/vm/attachListener_linux.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/linux/vm/attachListener_linux.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -453,7 +453,7 @@ if (ret == 0) { ret = ::unlink(fn); if (ret == -1) { - debug_only(warning("failed to remove stale attach pid file at %s", fn)); + log_debug(attach)("Failed to remove stale attach pid file at %s", fn); } } } @@ -496,16 +496,23 @@ struct stat64 st; RESTARTABLE(::stat64(fn, &st), ret); if (ret == -1) { + log_trace(attach)("Failed to find attach file: %s, trying alternate", fn); snprintf(fn, sizeof(fn), "%s/.attach_pid%d", os::get_temp_directory(), os::current_process_id()); RESTARTABLE(::stat64(fn, &st), ret); + if (ret == -1) { + log_debug(attach)("Failed to find attach file: %s", fn); + } } if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file if (st.st_uid == geteuid()) { init(); + log_trace(attach)("Attach trigerred by %s", fn); return true; + } else { + log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not trigerred", fn, st.st_uid, geteuid()); } } return false;
--- a/src/os/linux/vm/os_linux.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/linux/vm/os_linux.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -3971,7 +3971,8 @@ // - sets target osthread state to continue // - sends signal to end the sigsuspend loop in the SR_handler // -// Note that the SR_lock plays no role in this suspend/resume protocol. +// Note that the SR_lock plays no role in this suspend/resume protocol, +// but is checked for NULL in SR_handler as a thread termination indicator. static void resume_clear_context(OSThread *osthread) { osthread->set_ucontext(NULL); @@ -4004,8 +4005,20 @@ Thread* thread = Thread::current_or_null_safe(); assert(thread != NULL, "Missing current thread in SR_handler"); + + // On some systems we have seen signal delivery get "stuck" until the signal + // mask is changed as part of thread termination. Check that the current thread + // has not already terminated (via SR_lock()) - else the following assertion + // will fail because the thread is no longer a JavaThread as the ~JavaThread + // destructor has completed. + + if (thread->SR_lock() == NULL) { + return; + } + + assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread"); + OSThread* osthread = thread->osthread(); - assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread"); os::SuspendResume::State current = osthread->sr.state(); if (current == os::SuspendResume::SR_SUSPEND_REQUEST) {
--- a/src/os/posix/vm/os_posix.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/posix/vm/os_posix.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -93,10 +93,6 @@ } int os::get_native_stack(address* stack, int frames, int toSkip) { -#ifdef _NMT_NOINLINE_ - toSkip++; -#endif - int frame_idx = 0; int num_of_frames; // number of frames captured frame fr = os::current_frame();
--- a/src/os/solaris/vm/attachListener_solaris.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/solaris/vm/attachListener_solaris.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -394,7 +394,7 @@ snprintf(initial_path, sizeof(initial_path), "%s.tmp", door_path); RESTARTABLE(::creat(initial_path, S_IRUSR | S_IWUSR), fd); if (fd == -1) { - debug_only(warning("attempt to create %s failed", initial_path)); + log_debug(attach)("attempt to create door file %s failed (%d)", initial_path, errno); ::door_revoke(dd); return -1; } @@ -409,6 +409,7 @@ res = ::fattach(dd, initial_path); } if (res == -1) { + log_debug(attach)("unable to create door - fattach failed (%d)", errno); ::door_revoke(dd); dd = -1; } @@ -419,12 +420,14 @@ if (::rename(initial_path, door_path) == -1) { ::close(dd); ::fdetach(initial_path); + log_debug(attach)("unable to create door - rename %s to %s failed (%d)", errno); dd = -1; } } if (dd >= 0) { set_door_descriptor(dd); set_door_path(door_path); + log_trace(attach)("door file %s created succesfully", door_path); } else { // unable to create door, attach it to file, or rename file into place ::unlink(initial_path); @@ -602,7 +605,7 @@ if (ret == 0) { ret = ::unlink(fn); if (ret == -1) { - debug_only(warning("failed to remove stale attach pid file at %s", fn)); + log_debug(attach)("Failed to remove stale attach pid file at %s", fn); } } } @@ -645,9 +648,13 @@ struct stat64 st; RESTARTABLE(::stat64(fn, &st), ret); if (ret == -1) { + log_trace(attach)("Failed to find attach file: %s, trying alternate", fn); snprintf(fn, sizeof(fn), "%s/.attach_pid%d", os::get_temp_directory(), os::current_process_id()); RESTARTABLE(::stat64(fn, &st), ret); + if (ret == -1) { + log_debug(attach)("Failed to find attach file: %s", fn); + } } if (ret == 0) { // simple check to avoid starting the attach mechanism when
--- a/src/os/windows/vm/os_windows.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os/windows/vm/os_windows.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -318,9 +318,6 @@ // only supported on Windows XP or later. // int os::get_native_stack(address* stack, int frames, int toSkip) { -#ifdef _NMT_NOINLINE_ - toSkip++; -#endif int captured = RtlCaptureStackBackTrace(toSkip + 1, frames, (PVOID*)stack, NULL); for (int index = captured; index < frames; index ++) { stack[index] = NULL;
--- a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -417,7 +417,15 @@ #else register intptr_t **ebp __asm__ (SPELL_REG_FP); #endif - return (intptr_t*) *ebp; // we want what it points to. + // ebp is for this frame (_get_previous_fp). We want the ebp for the + // caller of os::current_frame*(), so go up two frames. However, for + // optimized builds, _get_previous_fp() will be inlined, so only go + // up 1 frame in that case. +#ifdef _NMT_NOINLINE_ + return **(intptr_t***)ebp; +#else + return *ebp; +#endif }
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -235,7 +235,15 @@ #else register intptr_t **ebp __asm__ (SPELL_REG_FP); #endif - return (intptr_t*) *ebp; // we want what it points to. + // ebp is for this frame (_get_previous_fp). We want the ebp for the + // caller of os::current_frame*(), so go up two frames. However, for + // optimized builds, _get_previous_fp() will be inlined, so only go + // up 1 frame in that case. +#ifdef _NMT_NOINLINE_ + return **(intptr_t***)ebp; +#else + return *ebp; +#endif }
--- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -292,15 +292,19 @@ frame os::current_frame() { intptr_t* fp = _get_current_fp(); // it's inlined so want current fp + // fp is for os::current_frame. We want the fp for our caller. frame myframe((intptr_t*)os::current_stack_pointer(), (intptr_t*)fp, CAST_FROM_FN_PTR(address, os::current_frame)); - if (os::is_first_C_frame(&myframe)) { + frame caller_frame = os::get_sender_for_C_frame(&myframe); + + if (os::is_first_C_frame(&caller_frame)) { // stack is not walkable frame ret; // This will be a null useless frame return ret; } else { - return os::get_sender_for_C_frame(&myframe); + // return frame for our caller's caller + return os::get_sender_for_C_frame(&caller_frame); } }
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -496,7 +496,15 @@ __asm { mov frameptr, ebp }; + // ebp (frameptr) is for this frame (_get_previous_fp). We want the ebp for the + // caller of os::current_frame*(), so go up two frames. However, for + // optimized builds, _get_previous_fp() will be inlined, so only go + // up 1 frame in that case. +#ifdef _NMT_NOINLINE_ + return **(intptr_t***)frameptr; +#else return *frameptr; +#endif } #endif // !AMD64
--- a/src/share/vm/classfile/classFileParser.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/classfile/classFileParser.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -5844,6 +5844,7 @@ _super_klass, _methods, _access_flags, + _major_version, _loader_data->class_loader(), _class_name, _local_interfaces,
--- a/src/share/vm/classfile/classLoader.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/classfile/classLoader.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -140,7 +140,7 @@ PerfCounter* ClassLoader::_isUnsyncloadClass = NULL; PerfCounter* ClassLoader::_load_instance_class_failCounter = NULL; -GrowableArray<ModuleClassPathList*>* ClassLoader::_xpatch_entries = NULL; +GrowableArray<ModuleClassPathList*>* ClassLoader::_patch_mod_entries = NULL; GrowableArray<ModuleClassPathList*>* ClassLoader::_exploded_entries = NULL; ClassPathEntry* ClassLoader::_jrt_entry = NULL; ClassPathEntry* ClassLoader::_first_append_entry = NULL; @@ -685,27 +685,27 @@ } #endif -// Construct the array of module/path pairs as specified to -Xpatch +// Construct the array of module/path pairs as specified to --patch-module // for the boot loader to search ahead of the jimage, if the class being -// loaded is defined to a module that has been specified to -Xpatch. -void ClassLoader::setup_xpatch_entries() { +// loaded is defined to a module that has been specified to --patch-module. +void ClassLoader::setup_patch_mod_entries() { Thread* THREAD = Thread::current(); - GrowableArray<ModuleXPatchPath*>* xpatch_args = Arguments::get_xpatchprefix(); - int num_of_entries = xpatch_args->length(); + GrowableArray<ModulePatchPath*>* patch_mod_args = Arguments::get_patch_mod_prefix(); + int num_of_entries = patch_mod_args->length(); - assert(!DumpSharedSpaces, "DumpSharedSpaces not supported with -Xpatch"); - assert(!UseSharedSpaces, "UseSharedSpaces not supported with -Xpatch"); + assert(!DumpSharedSpaces, "DumpSharedSpaces not supported with --patch-module"); + assert(!UseSharedSpaces, "UseSharedSpaces not supported with --patch-module"); - // Set up the boot loader's _xpatch_entries list - _xpatch_entries = new (ResourceObj::C_HEAP, mtModule) GrowableArray<ModuleClassPathList*>(num_of_entries, true); + // Set up the boot loader's _patch_mod_entries list + _patch_mod_entries = new (ResourceObj::C_HEAP, mtModule) GrowableArray<ModuleClassPathList*>(num_of_entries, true); for (int i = 0; i < num_of_entries; i++) { - const char* module_name = (xpatch_args->at(i))->module_name(); + const char* module_name = (patch_mod_args->at(i))->module_name(); Symbol* const module_sym = SymbolTable::lookup(module_name, (int)strlen(module_name), CHECK); assert(module_sym != NULL, "Failed to obtain Symbol for module name"); ModuleClassPathList* module_cpl = new ModuleClassPathList(module_sym); - char* class_path = (xpatch_args->at(i))->path_string(); + char* class_path = (patch_mod_args->at(i))->path_string(); int len = (int)strlen(class_path); int end = 0; // Iterate over the module's class path entries @@ -735,10 +735,10 @@ } } - // Record the module into the list of -Xpatch entries only if + // Record the module into the list of --patch-module entries only if // valid ClassPathEntrys have been created if (module_cpl->module_first_entry() != NULL) { - _xpatch_entries->push(module_cpl); + _patch_mod_entries->push(module_cpl); } } } @@ -1020,9 +1020,9 @@ ClassPathEntry* e; tty->print("[bootclasspath= "); - // Print -Xpatch module/path specifications first - if (_xpatch_entries != NULL) { - print_module_entry_table(_xpatch_entries); + // Print --patch-module module/path specifications first + if (_patch_mod_entries != NULL) { + print_module_entry_table(_patch_mod_entries); } // [jimage | exploded modules build] @@ -1341,7 +1341,7 @@ return file_name; } -// Search either the xpatch or exploded build entries for class +// Search either the patch-module or exploded build entries for class ClassFileStream* ClassLoader::search_module_entries(const GrowableArray<ModuleClassPathList*>* const module_list, const char* const class_name, const char* const file_name, TRAPS) { ClassFileStream* stream = NULL; @@ -1366,7 +1366,7 @@ int num_of_entries = module_list->length(); const Symbol* class_module_name = mod_entry->name(); - // Loop through all the modules in either the xpatch or exploded entries looking for module + // Loop through all the modules in either the patch-module or exploded entries looking for module for (int i = 0; i < num_of_entries; i++) { ModuleClassPathList* module_cpl = module_list->at(i); Symbol* module_cpl_name = module_cpl->module_name(); @@ -1378,7 +1378,7 @@ while (e != NULL) { stream = e->open_stream(file_name, CHECK_NULL); // No context.check is required since CDS is not supported - // for an exploded modules build or if -Xpatch is specified. + // for an exploded modules build or if --patch-module is specified. if (NULL != stream) { return stream; } @@ -1420,32 +1420,32 @@ // If DumpSharedSpaces is true boot loader visibility boundaries are set to: // - [jimage] + [_first_append_entry to _last_append_entry] (all path entries). - // No -Xpatch entries or exploded module builds are included since CDS - // is not supported if -Xpatch or exploded module builds are used. + // No --patch-module entries or exploded module builds are included since CDS + // is not supported if --patch-module or exploded module builds are used. // // If search_append_only is true, boot loader visibility boundaries are // set to be _first_append_entry to the end. This includes: // [-Xbootclasspath/a]; [jvmti appended entries] // // If both DumpSharedSpaces and search_append_only are false, boot loader - // visibility boundaries are set to be the -Xpatch entries plus the base piece. + // visibility boundaries are set to be the --patch-module entries plus the base piece. // This would include: - // [-Xpatch:<module>=<file>(<pathsep><file>)*]; [jimage | exploded module build] + // [--patch-module=<module>=<file>(<pathsep><file>)*]; [jimage | exploded module build] // // DumpSharedSpaces and search_append_only are mutually exclusive and cannot // be true at the same time. assert(!(DumpSharedSpaces && search_append_only), "DumpSharedSpaces and search_append_only are both true"); - // Load Attempt #1: -Xpatch - // Determine the class' defining module. If it appears in the _xpatch_entries, + // Load Attempt #1: --patch-module + // Determine the class' defining module. If it appears in the _patch_mod_entries, // attempt to load the class from those locations specific to the module. - // Specifications to -Xpatch can contain a partial number of classes + // Specifications to --patch-module can contain a partial number of classes // that are part of the overall module definition. So if a particular class is not // found within its module specification, the search should continue to Load Attempt #2. - // Note: The -Xpatch entries are never searched if the boot loader's + // Note: The --patch-module entries are never searched if the boot loader's // visibility boundary is limited to only searching the append entries. - if (_xpatch_entries != NULL && !search_append_only && !DumpSharedSpaces) { - stream = search_module_entries(_xpatch_entries, class_name, file_name, CHECK_NULL); + if (_patch_mod_entries != NULL && !search_append_only && !DumpSharedSpaces) { + stream = search_module_entries(_patch_mod_entries, class_name, file_name, CHECK_NULL); } // Load Attempt #2: [jimage | exploded build] @@ -1650,11 +1650,11 @@ // Create the moduleEntry for java.base create_javabase(); - // Setup the list of module/path pairs for -Xpatch processing + // Setup the list of module/path pairs for --patch-module processing // This must be done after the SymbolTable is created in order // to use fast_compare on module names instead of a string compare. - if (Arguments::get_xpatchprefix() != NULL) { - setup_xpatch_entries(); + if (Arguments::get_patch_mod_prefix() != NULL) { + setup_patch_mod_entries(); } // Setup the initial java.base/path pair for the exploded build entries.
--- a/src/share/vm/classfile/classLoader.hpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/classfile/classLoader.hpp Fri Aug 19 14:35:15 2016 -0700 @@ -150,7 +150,7 @@ // ModuleClassPathList contains a linked list of ClassPathEntry's // that have been specified for a specific module. Currently, -// the only way to specify a module/path pair is via the -Xpatch +// the only way to specify a module/path pair is via the --patch-module // command line option. class ModuleClassPathList : public CHeapObj<mtClass> { private: @@ -213,8 +213,8 @@ static PerfCounter* _load_instance_class_failCounter; // The boot class path consists of 3 ordered pieces: - // 1. the module/path pairs specified to -Xpatch - // -Xpatch:<module>=<file>(<pathsep><file>)* + // 1. the module/path pairs specified to --patch-module + // --patch-module=<module>=<file>(<pathsep><file>)* // 2. the base piece // [jimage | build with exploded modules] // 3. boot loader append path @@ -223,8 +223,8 @@ // The boot loader must obey this order when attempting // to load a class. - // 1. Contains the module/path pairs specified to -Xpatch - static GrowableArray<ModuleClassPathList*>* _xpatch_entries; + // 1. Contains the module/path pairs specified to --patch-module + static GrowableArray<ModuleClassPathList*>* _patch_mod_entries; // 2. the base piece // Contains the ClassPathEntry of the modular java runtime image. @@ -256,11 +256,11 @@ // Initialization: // - setup the boot loader's system class path - // - setup the boot loader's xpatch entries, if present + // - setup the boot loader's patch mod entries, if present // - create the ModuleEntry for java.base static void setup_bootstrap_search_path(); static void setup_search_path(const char *class_path, bool setting_bootstrap); - static void setup_xpatch_entries(); + static void setup_patch_mod_entries(); static void create_javabase(); static void load_zip_library(); @@ -363,7 +363,7 @@ // Add a module's exploded directory to the boot loader's exploded module build list static void add_to_exploded_build_list(Symbol* module_name, TRAPS); - // Attempt load of individual class from either the xpatch or exploded modules build lists + // Attempt load of individual class from either the patched or exploded modules build lists static ClassFileStream* search_module_entries(const GrowableArray<ModuleClassPathList*>* const module_list, const char* const class_name, const char* const file_name, TRAPS);
--- a/src/share/vm/logging/logTag.hpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/logging/logTag.hpp Fri Aug 19 14:35:15 2016 -0700 @@ -35,8 +35,9 @@ LOG_TAG(add) \ LOG_TAG(age) \ LOG_TAG(alloc) \ + LOG_TAG(annotation) \ LOG_TAG(arguments) \ - LOG_TAG(annotation) \ + LOG_TAG(attach) \ LOG_TAG(barrier) \ LOG_TAG(biasedlocking) \ LOG_TAG(bot) \
--- a/src/share/vm/memory/filemap.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/memory/filemap.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -911,8 +911,8 @@ return false; } - if (Arguments::get_xpatchprefix() != NULL) { - FileMapInfo::fail_continue("The shared archive file cannot be used with -Xpatch."); + if (Arguments::get_patch_mod_prefix() != NULL) { + FileMapInfo::fail_continue("The shared archive file cannot be used with --patch-module."); return false; }
--- a/src/share/vm/oops/klassVtable.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/oops/klassVtable.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -60,7 +60,7 @@ void klassVtable::compute_vtable_size_and_num_mirandas( int* vtable_length_ret, int* num_new_mirandas, GrowableArray<Method*>* all_mirandas, const Klass* super, - Array<Method*>* methods, AccessFlags class_flags, + Array<Method*>* methods, AccessFlags class_flags, u2 major_version, Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces, TRAPS) { NoSafepointVerifier nsv; @@ -77,7 +77,7 @@ assert(methods->at(i)->is_method(), "must be a Method*"); methodHandle mh(THREAD, methods->at(i)); - if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, THREAD)) { + if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, major_version, THREAD)) { vtable_length += vtableEntry::size(); // we need a new entry } } @@ -256,10 +256,15 @@ // In class hierarchies where the accessibility is not increasing (i.e., going from private -> // package_private -> public/protected), the vtable might actually be smaller than our initial - // calculation. - assert(initialized <= _length, "vtable initialization failed"); - for(;initialized < _length; initialized++) { - put_method_at(NULL, initialized); + // calculation, for classfile versions for which we do not do transitive override + // calculations. + if (ik()->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) { + assert(initialized == _length, "vtable initialization failed"); + } else { + assert(initialized <= _length, "vtable initialization failed"); + for(;initialized < _length; initialized++) { + table()[initialized].clear(); + } } NOT_PRODUCT(verify(tty, true)); } @@ -298,9 +303,9 @@ ResourceMark rm(THREAD); outputStream* logst = Log(vtables)::trace_stream(); char* sig = target_method()->name_and_sig_as_C_string(); - logst->print("transitive overriding superclass %s with %s::%s index %d, original flags: ", + logst->print("transitive overriding superclass %s with %s index %d, original flags: ", supersuperklass->internal_name(), - _klass->internal_name(), sig, vtable_index); + sig, vtable_index); super_method->print_linkage_flags(logst); logst->print("overriders flags: "); target_method->print_linkage_flags(logst); @@ -330,11 +335,11 @@ outputStream* logst = Log(vtables)::trace_stream(); char* sig = target_method()->name_and_sig_as_C_string(); if (overrides) { - logst->print("overriding with %s::%s index %d, original flags: ", - target_klass->internal_name(), sig, i); + logst->print("overriding with %s index %d, original flags: ", + sig, i); } else { - logst->print("NOT overriding with %s::%s index %d, original flags: ", - target_klass->internal_name(), sig, i); + logst->print("NOT overriding with %s index %d, original flags: ", + sig, i); } super_method->print_linkage_flags(logst); logst->print("overriders flags: "); @@ -566,6 +571,7 @@ Handle classloader, Symbol* classname, AccessFlags class_flags, + u2 major_version, TRAPS) { if (class_flags.is_interface()) { // Interfaces do not use vtables, except for java.lang.Object methods, @@ -646,8 +652,12 @@ } } - // Start with lookup result and continue to search up - k = superk->super(); // haven't found an override match yet; continue to look + // Start with lookup result and continue to search up, for versions supporting transitive override + if (major_version >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) { + k = superk->super(); // haven't found an override match yet; continue to look + } else { + break; + } } // if the target method is public or protected it may have a matching @@ -1500,15 +1510,22 @@ void vtableEntry::verify(klassVtable* vt, outputStream* st) { NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true)); - assert(method() != NULL, "must have set method"); - method()->verify(); - // we sub_type, because it could be a miranda method - if (!vt->klass()->is_subtype_of(method()->method_holder())) { + KlassHandle vtklass_h = vt->klass(); + Klass* vtklass = vtklass_h(); + if (vtklass->is_instance_klass() && + (InstanceKlass::cast(vtklass)->major_version() >= klassVtable::VTABLE_TRANSITIVE_OVERRIDE_VERSION)) { + assert(method() != NULL, "must have set method"); + } + if (method() != NULL) { + method()->verify(); + // we sub_type, because it could be a miranda method + if (!vtklass_h->is_subtype_of(method()->method_holder())) { #ifndef PRODUCT - print(); + print(); #endif - fatal("vtableEntry " PTR_FORMAT ": method is from subclass", p2i(this)); - } + fatal("vtableEntry " PTR_FORMAT ": method is from subclass", p2i(this)); + } + } } #ifndef PRODUCT
--- a/src/share/vm/oops/klassVtable.hpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/oops/klassVtable.hpp Fri Aug 19 14:35:15 2016 -0700 @@ -90,6 +90,7 @@ const Klass* super, Array<Method*>* methods, AccessFlags class_flags, + u2 major_version, Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces, @@ -115,8 +116,14 @@ protected: friend class vtableEntry; + + public: + // Transitive overridng rules for class files < JDK1_7 use the older JVMS rules. + // Overriding is determined as we create the vtable, so we use the class file version + // of the class whose vtable we are calculating. + enum { VTABLE_TRANSITIVE_OVERRIDE_VERSION = 51 } ; + private: - enum { VTABLE_TRANSITIVE_OVERRIDE_VERSION = 51 } ; void copy_vtable_to(vtableEntry* start); int initialize_from_super(KlassHandle super); int index_of(Method* m, int len) const; // same as index_of, but search only up to len @@ -126,6 +133,7 @@ Handle classloader, Symbol* classname, AccessFlags access_flags, + u2 major_version, TRAPS); bool update_inherited_vtable(InstanceKlass* klass, methodHandle target_method, int super_vtable_len, int default_index, bool checkconstraints, TRAPS);
--- a/src/share/vm/prims/jvmtiEnv.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/prims/jvmtiEnv.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -24,6 +24,8 @@ #include "precompiled.hpp" #include "classfile/classLoaderExt.hpp" +#include "classfile/javaClasses.inline.hpp" +#include "classfile/stringTable.hpp" #include "classfile/modules.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" @@ -224,6 +226,7 @@ return JVMTI_ERROR_NONE; } /* end GetNamedModule */ + // // Class functions // @@ -3465,28 +3468,35 @@ JvmtiEnv::GetSystemProperties(jint* count_ptr, char*** property_ptr) { jvmtiError err = JVMTI_ERROR_NONE; - *count_ptr = Arguments::PropertyList_count(Arguments::system_properties()); - + // Get the number of readable properties. + *count_ptr = Arguments::PropertyList_readable_count(Arguments::system_properties()); + + // Allocate memory to hold the exact number of readable properties. err = allocate(*count_ptr * sizeof(char *), (unsigned char **)property_ptr); if (err != JVMTI_ERROR_NONE) { return err; } - int i = 0 ; - for (SystemProperty* p = Arguments::system_properties(); p != NULL && i < *count_ptr; p = p->next(), i++) { - const char *key = p->key(); - char **tmp_value = *property_ptr+i; - err = allocate((strlen(key)+1) * sizeof(char), (unsigned char**)tmp_value); - if (err == JVMTI_ERROR_NONE) { - strcpy(*tmp_value, key); - } else { - // clean up previously allocated memory. - for (int j=0; j<i; j++) { - Deallocate((unsigned char*)*property_ptr+j); + int readable_count = 0; + // Loop through the system properties until all the readable properties are found. + for (SystemProperty* p = Arguments::system_properties(); p != NULL && readable_count < *count_ptr; p = p->next()) { + if (p->is_readable()) { + const char *key = p->key(); + char **tmp_value = *property_ptr+readable_count; + readable_count++; + err = allocate((strlen(key)+1) * sizeof(char), (unsigned char**)tmp_value); + if (err == JVMTI_ERROR_NONE) { + strcpy(*tmp_value, key); + } else { + // clean up previously allocated memory. + for (int j=0; j<readable_count; j++) { + Deallocate((unsigned char*)*property_ptr+j); + } + Deallocate((unsigned char*)property_ptr); + break; } - Deallocate((unsigned char*)property_ptr); - break; } } + assert(err != JVMTI_ERROR_NONE || readable_count == *count_ptr, "Bad readable property count"); return err; } /* end GetSystemProperties */ @@ -3498,7 +3508,8 @@ jvmtiError err = JVMTI_ERROR_NONE; const char *value; - value = Arguments::PropertyList_get_value(Arguments::system_properties(), property); + // Return JVMTI_ERROR_NOT_AVAILABLE if property is not readable or doesn't exist. + value = Arguments::PropertyList_get_readable_value(Arguments::system_properties(), property); if (value == NULL) { err = JVMTI_ERROR_NOT_AVAILABLE; } else {
--- a/src/share/vm/prims/unsafe.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/prims/unsafe.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -861,6 +861,13 @@ } const Klass* host_klass = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(host_class)); + + // Make sure it's the real host class, not another anonymous class. + while (host_klass != NULL && host_klass->is_instance_klass() && + InstanceKlass::cast(host_klass)->is_anonymous()) { + host_klass = InstanceKlass::cast(host_klass)->host_klass(); + } + // Primitive types have NULL Klass* fields in their java.lang.Class instances. if (host_klass == NULL) { THROW_0(vmSymbols::java_lang_IllegalArgumentException());
--- a/src/share/vm/runtime/arguments.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/runtime/arguments.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -110,7 +110,7 @@ SystemProperty *Arguments::_java_class_path = NULL; SystemProperty *Arguments::_jdk_boot_class_path_append = NULL; -GrowableArray<ModuleXPatchPath*> *Arguments::_xpatchprefix = NULL; +GrowableArray<ModulePatchPath*> *Arguments::_patch_mod_prefix = NULL; PathString *Arguments::_system_boot_class_path = NULL; bool Arguments::_has_jimage = false; @@ -161,6 +161,30 @@ } } +bool needs_module_property_warning = false; + +#define MODULE_PROPERTY_PREFIX "jdk.module" +#define MODULE_PROPERTY_PREFIX_LEN 10 +#define MODULE_MAIN_PROPERTY "jdk.module.main" +#define MODULE_MAIN_PROPERTY_LEN 15 + +// Return TRUE if option matches property, or property=, or property.. +static bool matches_property_prefix(const char* option, const char* property, size_t len) { + return (strncmp(option, property, len) == 0) && + (option[len] == '=' || option[len] == '.' || option[len] == '\0'); +} + +// Return true if the property is either "jdk.module" or starts with "jdk.module.", +// but does not start with "jdk.module.main". +// Return false if jdk.module.main because jdk.module.main and jdk.module.main.class +// are valid non-internal system properties. +// "property" should be passed without the leading "-D". +bool Arguments::is_internal_module_property(const char* property) { + assert((strncmp(property, "-D", 2) != 0), "Unexpected leading -D"); + return (matches_property_prefix(property, MODULE_PROPERTY_PREFIX, MODULE_PROPERTY_PREFIX_LEN) && + !matches_property_prefix(property, MODULE_MAIN_PROPERTY, MODULE_MAIN_PROPERTY_LEN)); +} + // Process java launcher properties. void Arguments::process_sun_java_launcher_properties(JavaVMInitArgs* args) { // See if sun.java.launcher, sun.java.launcher.is_altjvm or @@ -197,7 +221,7 @@ _system_boot_class_path = new PathString(NULL); PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name", - "Java Virtual Machine Specification", false)); + "Java Virtual Machine Specification", false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.info", VM_Version::vm_info_string(), true)); @@ -1198,7 +1222,7 @@ return PropertyList_get_value(system_properties(), key); } -bool Arguments::add_property(const char* prop) { +bool Arguments::add_property(const char* prop, PropertyWriteable writeable, PropertyInternal internal) { const char* eq = strchr(prop, '='); const char* key; const char* value = ""; @@ -1228,7 +1252,9 @@ // private and are processed in process_sun_java_launcher_properties(); // the sun.java.launcher property is passed on to the java application } else if (strcmp(key, "sun.boot.library.path") == 0) { - PropertyList_unique_add(&_system_properties, key, value, true); + // append is true, writable is true, internal is false + PropertyList_unique_add(&_system_properties, key, value, AppendProperty, + WriteableProperty, ExternalProperty); } else { if (strcmp(key, "sun.java.command") == 0) { char *old_java_command = _java_command; @@ -1248,7 +1274,7 @@ } // Create new property and add at the end of the list - PropertyList_unique_add(&_system_properties, key, value); + PropertyList_unique_add(&_system_properties, key, value, AddProperty, writeable, internal); } if (key != prop) { @@ -1260,9 +1286,9 @@ return true; } -// sets or adds a module name to the jdk.launcher.addmods property +// sets or adds a module name to the jdk.module.addmods property bool Arguments::append_to_addmods_property(const char* module_name) { - const char* key = "jdk.launcher.addmods"; + const char* key = "jdk.module.addmods"; const char* old_value = Arguments::get_property(key); size_t buf_len = strlen(key) + strlen(module_name) + 2; if (old_value != NULL) { @@ -1277,7 +1303,7 @@ } else { jio_snprintf(new_value, buf_len, "%s=%s,%s", key, old_value, module_name); } - bool added = add_property(new_value); + bool added = add_property(new_value, UnwriteableProperty, InternalProperty); FreeHeap(new_value); return added; } @@ -1287,14 +1313,14 @@ assert(DumpSharedSpaces, "this function is only used with -Xshare:dump"); const char* unsupported_properties[5] = { "jdk.module.main", "jdk.module.path", - "jdk.upgrade.module.path", - "jdk.launcher.addmods", - "jdk.launcher.limitmods" }; + "jdk.module.upgrade.path", + "jdk.module.addmods", + "jdk.module.limitmods" }; const char* unsupported_options[5] = { "-m", - "-modulepath", - "-upgrademodulepath", - "-addmods", - "-limitmods" }; + "--module-path", + "--upgrade-module-path", + "--add-modules", + "--limit-modules" }; SystemProperty* sp = system_properties(); while (sp != NULL) { for (int i = 0; i < 5; i++) { @@ -1326,7 +1352,7 @@ // Ensure Agent_OnLoad has the correct initial values. // This may not be the final mode; mode may change later in onload phase. PropertyList_unique_add(&_system_properties, "java.vm.info", - VM_Version::vm_info_string(), false); + VM_Version::vm_info_string(), AddProperty, UnwriteableProperty, ExternalProperty); UseInterpreter = true; UseCompiler = true; @@ -2516,6 +2542,41 @@ return false; } +unsigned int addreads_count = 0; +unsigned int addexports_count = 0; +unsigned int patch_mod_count = 0; +const char* add_modules_value = NULL; + +bool Arguments::create_property(const char* prop_name, const char* prop_value, PropertyInternal internal) { + size_t prop_len = strlen(prop_name) + strlen(prop_value) + 2; + char* property = AllocateHeap(prop_len, mtArguments); + int ret = jio_snprintf(property, prop_len, "%s=%s", prop_name, prop_value); + if (ret < 0 || ret >= (int)prop_len) { + FreeHeap(property); + return false; + } + bool added = add_property(property, UnwriteableProperty, internal); + FreeHeap(property); + return added; +} + +bool Arguments::create_numbered_property(const char* prop_base_name, const char* prop_value, unsigned int count) { + // Make sure count is < 1,000. Otherwise, memory allocation will be too small. + if (count < 1000) { + size_t prop_len = strlen(prop_base_name) + strlen(prop_value) + 5; + char* property = AllocateHeap(prop_len, mtArguments); + int ret = jio_snprintf(property, prop_len, "%s.%d=%s", prop_base_name, count, prop_value); + if (ret < 0 || ret >= (int)prop_len) { + FreeHeap(property); + return false; + } + bool added = add_property(property, UnwriteableProperty, InternalProperty); + FreeHeap(property); + return added; + } + return false; +} + Arguments::ArgsRange Arguments::parse_memory_size(const char* s, julong* long_arg, julong min_size) { @@ -2528,7 +2589,7 @@ jint Arguments::parse_vm_init_args(const JavaVMInitArgs *java_tool_options_args, const JavaVMInitArgs *java_options_args, const JavaVMInitArgs *cmd_line_args) { - bool xpatch_javabase = false; + bool patch_mod_javabase = false; // Save default settings for some mode flags Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods; @@ -2545,20 +2606,20 @@ // Parse args structure generated from JAVA_TOOL_OPTIONS environment // variable (if present). - jint result = parse_each_vm_init_arg(java_tool_options_args, &xpatch_javabase, Flag::ENVIRON_VAR); + jint result = parse_each_vm_init_arg(java_tool_options_args, &patch_mod_javabase, Flag::ENVIRON_VAR); if (result != JNI_OK) { return result; } // Parse args structure generated from the command line flags. - result = parse_each_vm_init_arg(cmd_line_args, &xpatch_javabase, Flag::COMMAND_LINE); + result = parse_each_vm_init_arg(cmd_line_args, &patch_mod_javabase, Flag::COMMAND_LINE); if (result != JNI_OK) { return result; } // Parse args structure generated from the _JAVA_OPTIONS environment // variable (if present) (mimics classic VM) - result = parse_each_vm_init_arg(java_options_args, &xpatch_javabase, Flag::ENVIRON_VAR); + result = parse_each_vm_init_arg(java_options_args, &patch_mod_javabase, Flag::ENVIRON_VAR); if (result != JNI_OK) { return result; } @@ -2617,7 +2678,35 @@ return false; } -jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* xpatch_javabase, Flag::Flags origin) { +int Arguments::process_patch_mod_option(const char* patch_mod_tail, bool* patch_mod_javabase) { + // --patch-module=<module>=<file>(<pathsep><file>)* + assert(patch_mod_tail != NULL, "Unexpected NULL patch-module value"); + // Find the equal sign between the module name and the path specification + const char* module_equal = strchr(patch_mod_tail, '='); + if (module_equal == NULL) { + jio_fprintf(defaultStream::output_stream(), "Missing '=' in --patch-module specification\n"); + return JNI_ERR; + } else { + // Pick out the module name + size_t module_len = module_equal - patch_mod_tail; + char* module_name = NEW_C_HEAP_ARRAY_RETURN_NULL(char, module_len+1, mtArguments); + if (module_name != NULL) { + memcpy(module_name, patch_mod_tail, module_len); + *(module_name + module_len) = '\0'; + // The path piece begins one past the module_equal sign + add_patch_mod_prefix(module_name, module_equal + 1, patch_mod_javabase); + FREE_C_HEAP_ARRAY(char, module_name); + if (!create_numbered_property("jdk.module.patch", patch_mod_tail, patch_mod_count++)) { + return JNI_ENOMEM; + } + } else { + return JNI_ENOMEM; + } + } + return JNI_OK; +} + +jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, Flag::Flags origin) { // For match_option to return remaining or value part of option string const char* tail; @@ -2701,6 +2790,34 @@ #endif // !INCLUDE_JVMTI add_init_library(name, options); } + } else if (match_option(option, "--add-reads=", &tail)) { + if (!create_numbered_property("jdk.module.addreads", tail, addreads_count++)) { + return JNI_ENOMEM; + } + } else if (match_option(option, "--add-exports=", &tail)) { + if (!create_numbered_property("jdk.module.addexports", tail, addexports_count++)) { + return JNI_ENOMEM; + } + } else if (match_option(option, "--add-modules=", &tail)) { + add_modules_value = tail; + } else if (match_option(option, "--limit-modules=", &tail)) { + if (!create_property("jdk.module.limitmods", tail, InternalProperty)) { + return JNI_ENOMEM; + } + } else if (match_option(option, "--module-path=", &tail)) { + if (!create_property("jdk.module.path", tail, ExternalProperty)) { + return JNI_ENOMEM; + } + } else if (match_option(option, "--upgrade-module-path=", &tail)) { + if (!create_property("jdk.module.upgrade.path", tail, ExternalProperty)) { + return JNI_ENOMEM; + } + } else if (match_option(option, "--patch-module=", &tail)) { + // --patch-module=<module>=<file>(<pathsep><file>)* + int res = process_patch_mod_option(tail, patch_mod_javabase); + if (res != JNI_OK) { + return res; + } // -agentlib and -agentpath } else if (match_option(option, "-agentlib:", &tail) || (is_absolute_path = match_option(option, "-agentpath:", &tail))) { @@ -2992,6 +3109,13 @@ "-Djava.ext.dirs=%s is not supported. Use -classpath instead.\n", value); return JNI_EINVAL; } + // Check for module related properties. They must be set using the modules + // options. For example: use "--add-modules=java.sql", not + // "-Djdk.module.addmods=java.sql" + if (is_internal_module_property(option->optionString + 2)) { + needs_module_property_warning = true; + continue; + } if (!add_property(tail)) { return JNI_ENOMEM; @@ -3012,33 +3136,6 @@ return JNI_ERR; #endif } - if (match_option(option, "-Djdk.launcher.patch.", &tail)) { - // -Djdk.launcher.patch.#=<module>=<file>(<pathsep><file>)* - // The number, #, specified will be increasing with each -Xpatch - // specified on the command line. - // Pick up module name, following the -D property's equal sign. - const char* property_equal = strchr(tail, '='); - if (property_equal == NULL) { - jio_fprintf(defaultStream::output_stream(), "Missing '=' in -Xpatch specification\n"); - return JNI_ERR; - } else { - // Find the equal sign between the module name and the path specification - const char* module_equal = strchr(property_equal + 1, '='); - if (module_equal == NULL) { - jio_fprintf(defaultStream::output_stream(), "Bad value for -Xpatch, no module name specified\n"); - return JNI_ERR; - } else { - // Pick out the module name, in between the two equal signs - size_t module_len = module_equal - property_equal - 1; - char* module_name = NEW_C_HEAP_ARRAY(char, module_len+1, mtArguments); - memcpy(module_name, property_equal + 1, module_len); - *(module_name + module_len) = '\0'; - // The path piece begins one past the module_equal sign - Arguments::add_xpatchprefix(module_name, module_equal + 1, xpatch_javabase); - FREE_C_HEAP_ARRAY(char, module_name); - } - } - } // -Xint } else if (match_option(option, "-Xint")) { set_mode_flags(_int); @@ -3298,25 +3395,25 @@ return JNI_OK; } -void Arguments::add_xpatchprefix(const char* module_name, const char* path, bool* xpatch_javabase) { - // For java.base check for duplicate -Xpatch options being specified on the command line. +void Arguments::add_patch_mod_prefix(const char* module_name, const char* path, bool* patch_mod_javabase) { + // For java.base check for duplicate --patch-module options being specified on the command line. // This check is only required for java.base, all other duplicate module specifications // will be checked during module system initialization. The module system initialization // will throw an ExceptionInInitializerError if this situation occurs. if (strcmp(module_name, "java.base") == 0) { - if (*xpatch_javabase) { - vm_exit_during_initialization("Cannot specify java.base more than once to -Xpatch"); + if (*patch_mod_javabase) { + vm_exit_during_initialization("Cannot specify java.base more than once to --patch-module"); } else { - *xpatch_javabase = true; + *patch_mod_javabase = true; } } - // Create GrowableArray lazily, only if -Xpatch has been specified - if (_xpatchprefix == NULL) { - _xpatchprefix = new (ResourceObj::C_HEAP, mtArguments) GrowableArray<ModuleXPatchPath*>(10, true); - } - - _xpatchprefix->push(new ModuleXPatchPath(module_name, path)); + // Create GrowableArray lazily, only if --patch-module has been specified + if (_patch_mod_prefix == NULL) { + _patch_mod_prefix = new (ResourceObj::C_HEAP, mtArguments) GrowableArray<ModulePatchPath*>(10, true); + } + + _patch_mod_prefix->push(new ModulePatchPath(module_name, path)); } // Remove all empty paths from the app classpath (if IgnoreEmptyClassPaths is enabled) @@ -3441,6 +3538,15 @@ return JNI_ERR; } + // Append the value of the last --add-modules option specified on the command line. + // This needs to be done here, to prevent overwriting possible values written + // to the jdk.module.addmods property by -javaagent and other options. + if (add_modules_value != NULL) { + if (!append_to_addmods_property(add_modules_value)) { + return JNI_ENOMEM; + } + } + // This must be done after all arguments have been processed. // java_compiler() true means set to "NONE" or empty. if (java_compiler() && !xdebug_mode()) { @@ -3795,9 +3901,9 @@ void Arguments::set_shared_spaces_flags() { if (DumpSharedSpaces) { - if (Arguments::get_xpatchprefix() != NULL) { + if (Arguments::get_patch_mod_prefix() != NULL) { vm_exit_during_initialization( - "Cannot use the following option when dumping the shared archive", "-Xpatch"); + "Cannot use the following option when dumping the shared archive: --patch-module"); } if (RequireSharedSpaces) { @@ -4180,6 +4286,11 @@ hotspotrc, hotspotrc); } + if (needs_module_property_warning) { + warning("Ignoring system property options whose names start with '-Djdk.module'." + " They are reserved for internal use."); + } + #if defined(_ALLBSD_SOURCE) || defined(AIX) // UseLargePages is not yet supported on BSD and AIX. UNSUPPORTED_OPTION(UseLargePages); #endif @@ -4404,6 +4515,18 @@ return count; } +// Return the number of readable properties. +int Arguments::PropertyList_readable_count(SystemProperty* pl) { + int count = 0; + while(pl != NULL) { + if (pl->is_readable()) { + count++; + } + pl = pl->next(); + } + return count; +} + const char* Arguments::PropertyList_get_value(SystemProperty *pl, const char* key) { assert(key != NULL, "just checking"); SystemProperty* prop; @@ -4413,6 +4536,27 @@ return NULL; } +// Return the value of the requested property provided that it is a readable property. +const char* Arguments::PropertyList_get_readable_value(SystemProperty *pl, const char* key) { + assert(key != NULL, "just checking"); + SystemProperty* prop; + // Return the property value if the keys match and the property is not internal or + // it's the special internal property "jdk.boot.class.path.append". + for (prop = pl; prop != NULL; prop = prop->next()) { + if (strcmp(key, prop->key()) == 0) { + if (!prop->internal()) { + return prop->value(); + } else if (strcmp(key, "jdk.boot.class.path.append") == 0) { + return prop->value(); + } else { + // Property is internal and not jdk.boot.class.path.append so return NULL. + return NULL; + } + } + } + return NULL; +} + const char* Arguments::PropertyList_get_key_at(SystemProperty *pl, int index) { int count = 0; const char* ret_val = NULL; @@ -4457,11 +4601,12 @@ } } -void Arguments::PropertyList_add(SystemProperty** plist, const char* k, const char* v) { +void Arguments::PropertyList_add(SystemProperty** plist, const char* k, const char* v, + bool writeable, bool internal) { if (plist == NULL) return; - SystemProperty* new_p = new SystemProperty(k, v, true); + SystemProperty* new_p = new SystemProperty(k, v, writeable, internal); PropertyList_add(plist, new_p); } @@ -4470,7 +4615,9 @@ } // This add maintains unique property key in the list. -void Arguments::PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v, jboolean append) { +void Arguments::PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v, + PropertyAppendable append, PropertyWriteable writeable, + PropertyInternal internal) { if (plist == NULL) return; @@ -4478,16 +4625,16 @@ SystemProperty* prop; for (prop = *plist; prop != NULL; prop = prop->next()) { if (strcmp(k, prop->key()) == 0) { - if (append) { + if (append == AppendProperty) { prop->append_value(v); } else { - prop->set_writeable_value(v); + prop->set_value(v); } return; } } - PropertyList_add(plist, k, v); + PropertyList_add(plist, k, v, writeable == WriteableProperty, internal == InternalProperty); } // Copies src into buf, replacing "%%" with "%" and "%p" with pid
--- a/src/share/vm/runtime/arguments.hpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/runtime/arguments.hpp Fri Aug 19 14:35:15 2016 -0700 @@ -43,7 +43,7 @@ // PathString is used as: // - the underlying value for a SystemProperty -// - the path portion of an -Xpatch module/path pair +// - the path portion of an --patch-module module/path pair // - the string that represents the system boot class path, Arguments::_system_boot_class_path. class PathString : public CHeapObj<mtArguments> { protected: @@ -107,13 +107,13 @@ } }; -// ModuleXPatchPath records the module/path pair as specified to -Xpatch. -class ModuleXPatchPath : public CHeapObj<mtInternal> { +// ModulePatchPath records the module/path pair as specified to --patch-module. +class ModulePatchPath : public CHeapObj<mtInternal> { private: char* _module_name; PathString* _path; public: - ModuleXPatchPath(const char* module_name, const char* path) { + ModulePatchPath(const char* module_name, const char* path) { assert(module_name != NULL && path != NULL, "Invalid module name or path value"); size_t len = strlen(module_name) + 1; _module_name = AllocateHeap(len, mtInternal); @@ -121,7 +121,7 @@ _path = new PathString(path); } - ~ModuleXPatchPath() { + ~ModulePatchPath() { if (_module_name != NULL) { FreeHeap(_module_name); _module_name = NULL; @@ -158,6 +158,10 @@ SystemProperty* next() const { return _next; } void set_next(SystemProperty* next) { _next = next; } + bool is_readable() const { + return !_internal || strcmp(_key, "jdk.boot.class.path.append") == 0; + } + // A system property should only have its value set // via an external interface if it is a writeable property. // The internal, non-writeable property jdk.boot.class.path.append @@ -325,6 +329,21 @@ arg_in_range = 0 }; + enum PropertyAppendable { + AppendProperty, + AddProperty + }; + + enum PropertyWriteable { + WriteableProperty, + UnwriteableProperty + }; + + enum PropertyInternal { + InternalProperty, + ExternalProperty + }; + private: // a pointer to the flags file name if it is specified @@ -348,18 +367,18 @@ static SystemProperty *_java_class_path; static SystemProperty *_jdk_boot_class_path_append; - // -Xpatch:module=<file>(<pathsep><file>)* + // --patch-module=module=<file>(<pathsep><file>)* // Each element contains the associated module name, path - // string pair as specified to -Xpatch. - static GrowableArray<ModuleXPatchPath*>* _xpatchprefix; + // string pair as specified to --patch-module. + static GrowableArray<ModulePatchPath*>* _patch_mod_prefix; // The constructed value of the system class path after // argument processing and JVMTI OnLoad additions via // calls to AddToBootstrapClassLoaderSearch. This is the // final form before ClassLoader::setup_bootstrap_search(). - // Note: since -Xpatch is a module name/path pair, the system - // boot class path string no longer contains the "prefix" to - // the boot class path base piece as it did when + // Note: since --patch-module is a module name/path pair, the + // system boot class path string no longer contains the "prefix" + // to the boot class path base piece as it did when // -Xbootclasspath/p was supported. static PathString *_system_boot_class_path; @@ -462,7 +481,13 @@ static vfprintf_hook_t _vfprintf_hook; // System properties - static bool add_property(const char* prop); + static bool add_property(const char* prop, PropertyWriteable writeable=WriteableProperty, + PropertyInternal internal=ExternalProperty); + + static bool create_property(const char* prop_name, const char* prop_value, PropertyInternal internal); + static bool create_numbered_property(const char* prop_base_name, const char* prop_value, unsigned int count); + + static int process_patch_mod_option(const char* patch_mod_tail, bool* patch_mod_javabase); // Miscellaneous system property setter static bool append_to_addmods_property(const char* module_name); @@ -500,7 +525,7 @@ static jint parse_vm_init_args(const JavaVMInitArgs *java_tool_options_args, const JavaVMInitArgs *java_options_args, const JavaVMInitArgs *cmd_line_args); - static jint parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* xpatch_javabase, Flag::Flags origin); + static jint parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, Flag::Flags origin); static jint finalize_vm_init_args(); static bool is_bad_option(const JavaVMOption* option, jboolean ignore, const char* option_type); @@ -708,16 +733,20 @@ // Property List manipulation static void PropertyList_add(SystemProperty *element); static void PropertyList_add(SystemProperty** plist, SystemProperty *element); - static void PropertyList_add(SystemProperty** plist, const char* k, const char* v); - static void PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v) { - PropertyList_unique_add(plist, k, v, false); - } - static void PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v, jboolean append); + static void PropertyList_add(SystemProperty** plist, const char* k, const char* v, bool writeable, bool internal); + + static void PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v, + PropertyAppendable append, PropertyWriteable writeable, + PropertyInternal internal); static const char* PropertyList_get_value(SystemProperty* plist, const char* key); + static const char* PropertyList_get_readable_value(SystemProperty* plist, const char* key); static int PropertyList_count(SystemProperty* pl); + static int PropertyList_readable_count(SystemProperty* pl); static const char* PropertyList_get_key_at(SystemProperty* pl,int index); static char* PropertyList_get_value_at(SystemProperty* pl,int index); + static bool is_internal_module_property(const char* option); + // Miscellaneous System property value getter and setters. static void set_dll_dir(const char *value) { _sun_boot_library_path->set_value(value); } static void set_java_home(const char *value) { _java_home->set_value(value); } @@ -725,7 +754,7 @@ static void set_ext_dirs(char *value) { _ext_dirs = os::strdup_check_oom(value); } // Set up the underlying pieces of the system boot class path - static void add_xpatchprefix(const char *module_name, const char *path, bool* xpatch_javabase); + static void add_patch_mod_prefix(const char *module_name, const char *path, bool* patch_mod_javabase); static void set_sysclasspath(const char *value, bool has_jimage) { // During start up, set by os::set_boot_path() assert(get_sysclasspath() == NULL, "System boot class path previously set"); @@ -737,7 +766,7 @@ _jdk_boot_class_path_append->append_value(value); } - static GrowableArray<ModuleXPatchPath*>* get_xpatchprefix() { return _xpatchprefix; } + static GrowableArray<ModulePatchPath*>* get_patch_mod_prefix() { return _patch_mod_prefix; } static char* get_sysclasspath() { return _system_boot_class_path->value(); } static char* get_jdk_boot_class_path_append() { return _jdk_boot_class_path_append->value(); } static bool has_jimage() { return _has_jimage; }
--- a/src/share/vm/runtime/mutex.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/runtime/mutex.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -1148,7 +1148,16 @@ } Monitor::~Monitor() { - assert((UNS(_owner)|UNS(_LockWord.FullWord)|UNS(_EntryList)|UNS(_WaitSet)|UNS(_OnDeck)) == 0, ""); +#ifdef ASSERT + uintptr_t owner = UNS(_owner); + uintptr_t lockword = UNS(_LockWord.FullWord); + uintptr_t entrylist = UNS(_EntryList); + uintptr_t waitset = UNS(_WaitSet); + uintptr_t ondeck = UNS(_OnDeck); + assert((owner|lockword|entrylist|waitset|ondeck) == 0, + "_owner(" INTPTR_FORMAT ")|_LockWord(" INTPTR_FORMAT ")|_EntryList(" INTPTR_FORMAT ")|_WaitSet(" + INTPTR_FORMAT ")|_OnDeck(" INTPTR_FORMAT ") != 0", owner, lockword, entrylist, waitset, ondeck); +#endif } void Monitor::ClearMonitor(Monitor * m, const char *name) {
--- a/src/share/vm/runtime/reflection.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/runtime/reflection.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -660,11 +660,13 @@ } const Klass* host_class = current_class; - while (host_class->is_instance_klass() && - InstanceKlass::cast(host_class)->is_anonymous()) { - const Klass* next_host_class = InstanceKlass::cast(host_class)->host_klass(); - if (next_host_class == NULL) break; - host_class = next_host_class; + if (host_class->is_instance_klass() && + InstanceKlass::cast(host_class)->is_anonymous()) { + host_class = InstanceKlass::cast(host_class)->host_klass(); + assert(host_class != NULL, "Anonymous class has null host class"); + assert(!(host_class->is_instance_klass() && + InstanceKlass::cast(host_class)->is_anonymous()), + "host_class should not be anonymous"); } if (host_class == field_class) { return true;
--- a/src/share/vm/runtime/thread.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/runtime/thread.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -374,11 +374,14 @@ delete handle_area(); delete metadata_handles(); + // SR_handler uses this as a termination indicator - + // needs to happen before os::free_thread() + delete _SR_lock; + _SR_lock = NULL; + // osthread() can be NULL, if creation of thread failed. if (osthread() != NULL) os::free_thread(osthread()); - delete _SR_lock; - // clear Thread::current if thread is deleting itself. // Needed to ensure JNI correctly detects non-attached threads. if (this == Thread::current()) {
--- a/src/share/vm/utilities/nativeCallStack.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/utilities/nativeCallStack.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,6 +33,19 @@ _hash_value(0) { if (fillStack) { + // We need to skip the NativeCallStack::NativeCallStack frame if a tail call is NOT used + // to call os::get_native_stack. A tail call is used if _NMT_NOINLINE_ is not defined + // (which means this is not a slowdebug build), and we are on 64-bit (except Windows). + // This is not necessarily a rule, but what has been obvserved to date. +#define TAIL_CALL (!defined(_NMT_NOINLINE_) && !defined(WINDOWS) && defined(_LP64)) +#if !TAIL_CALL + toSkip++; +#if (defined(_NMT_NOINLINE_) && defined(BSD) && defined(_LP64)) + // Mac OS X slowdebug builds have this odd behavior where NativeCallStack::NativeCallStack + // appears as two frames, so we need to skip an extra frame. + toSkip++; +#endif +#endif os::get_native_stack(_stack, NMT_TrackingStackDepth, toSkip); } else { for (int index = 0; index < NMT_TrackingStackDepth; index ++) {
--- a/src/share/vm/utilities/ostream.cpp Fri Aug 19 08:34:30 2016 +0200 +++ b/src/share/vm/utilities/ostream.cpp Fri Aug 19 14:35:15 2016 -0700 @@ -703,13 +703,15 @@ // System properties don't generally contain newlines, so don't bother with unparsing. outputStream *text = xs->text(); for (SystemProperty* p = Arguments::system_properties(); p != NULL; p = p->next()) { - // Print in two stages to avoid problems with long - // keys/values. assert(p->key() != NULL, "p->key() is NULL"); - text->print_raw(p->key()); - text->put('='); - assert(p->value() != NULL, "p->value() is NULL"); - text->print_raw_cr(p->value()); + if (p->is_readable()) { + // Print in two stages to avoid problems with long + // keys/values. + text->print_raw(p->key()); + text->put('='); + assert(p->value() != NULL, "p->value() is NULL"); + text->print_raw_cr(p->value()); + } } xs->tail("properties"); }
--- a/test/TEST.ROOT Fri Aug 19 08:34:30 2016 +0200 +++ b/test/TEST.ROOT Fri Aug 19 14:35:15 2016 -0700 @@ -46,12 +46,12 @@ vm.gc.Parallel \ vm.gc.ConcMarkSweep -# Tests using jtreg 4.2 b02 features -requiredVersion=4.2 b02 +# Tests using jtreg 4.2 b03 features +requiredVersion=4.2 b03 # Path to libraries in the topmost test directory. This is needed so @library # does not need ../../ notation to reach them external.lib.roots = ../../ -# Use new form of -Xpatch -useNewXpatch=true +# Use new module options +useNewOptions=true
--- a/test/compiler/arguments/BMISupportedCPUTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/BMISupportedCPUTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,7 +23,7 @@ package compiler.arguments; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; /**
--- a/test/compiler/arguments/BMIUnsupportedCPUTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/BMIUnsupportedCPUTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,7 +23,7 @@ package compiler.arguments; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest;
--- a/test/compiler/arguments/CheckCICompilerCount.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/CheckCICompilerCount.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,7 +25,7 @@ * @test CheckCheckCICompilerCount * @bug 8130858 8132525 8162881 * @summary Check that correct range of values for CICompilerCount are allowed depending on whether tiered is enabled or not - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * @run driver compiler.arguments.CheckCICompilerCount @@ -33,8 +33,8 @@ package compiler.arguments; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckCICompilerCount { private static final String[][] NON_TIERED_ARGUMENTS = {
--- a/test/compiler/arguments/CheckCompileThresholdScaling.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/CheckCompileThresholdScaling.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,7 +25,7 @@ * @test CheckCompileThresholdScaling * @bug 8059604 * @summary Add CompileThresholdScaling flag to control when methods are first compiled (with +/-TieredCompilation) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver compiler.arguments.CheckCompileThresholdScaling @@ -33,8 +33,8 @@ package compiler.arguments; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckCompileThresholdScaling {
--- a/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,10 @@ * @bug 8031321 * @summary Verify processing of UseBMI1Instructions option on CPU with * BMI1 feature support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.arguments.TestUseBMI1InstructionsOnSupportedCPU - * compiler.arguments.BMISupportedCPUTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,10 @@ * @bug 8031321 * @summary Verify processing of UseBMI1Instructions option on CPU without * BMI1 feature support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.arguments.TestUseBMI1InstructionsOnUnsupportedCPU - * compiler.arguments.BMIUnsupportedCPUTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountLeadingZerosInstruction option * on CPU with LZCNT support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountLeadingZerosInstructionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountLeadingZerosInstruction option * on CPU without LZCNT support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountLeadingZerosInstructionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountTrailingZerosInstruction option * on CPU with TZCNT (BMI1 feature) support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountTrailingZerosInstruction option * on CPU without TZCNT instruction (BMI1 feature) support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,13 +26,12 @@ * @bug 8072016 * @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arraycopy.TestArrayCopyNoInitDeopt + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission - * jdk.test.lib.Platform * @run main/othervm -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020 * compiler.arraycopy.TestArrayCopyNoInitDeopt
--- a/test/compiler/c2/PolynomialRoot.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/PolynomialRoot.java Fri Aug 19 14:35:15 2016 -0700 @@ -13,7 +13,7 @@ * @test * @bug 8005956 * @summary C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management *
--- a/test/compiler/c2/Test5057225.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test5057225.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -26,7 +26,7 @@ * @bug 5057225 * @summary Remove useless I2L conversions * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c2.Test5057225::doload
--- a/test/compiler/c2/Test6603011.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test6603011.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, 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 @@ -26,7 +26,7 @@ * @bug 6603011 * @summary long/int division by constant * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp -Xbatch -XX:-Inline compiler.c2.Test6603011 */
--- a/test/compiler/c2/Test6800154.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test6800154.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -26,7 +26,7 @@ * @bug 6800154 * @summary Add comments to long_by_long_mulhi() for better understandability * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c2.Test6800154::divcomp
--- a/test/compiler/c2/Test6805724.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test6805724.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -27,7 +27,7 @@ * @summary ModLNode::Ideal() generates functionally incorrect graph * when divisor is any (2^k-1) constant. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c2.Test6805724::fcomp
--- a/test/compiler/c2/Test6857159.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test6857159.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -26,7 +26,7 @@ * @test * @bug 6857159 * @summary local schedule failed with checkcast of Thread.currentThread() - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -35,8 +35,8 @@ package compiler.c2; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class Test6857159 { public static void main(String[] args) throws Throwable {
--- a/test/compiler/c2/Test7068051.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test7068051.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, 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 @@ -26,7 +26,7 @@ * @test * @bug 7068051 * @summary SIGSEGV in PhaseIdealLoop::build_loop_late_post on T5440 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -36,7 +36,7 @@ package compiler.c2; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.io.IOException; import java.io.InputStream;
--- a/test/compiler/c2/Test7177917.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/Test7177917.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, 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 @@ -27,7 +27,7 @@ * @bug 7177917 * @summary Micro-benchmark for Math.pow() and Math.exp() * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main compiler.c2.Test7177917 */
--- a/test/compiler/c2/cr6589834/Test_ia32.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/cr6589834/Test_ia32.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -26,15 +26,13 @@ * @bug 6589834 * @summary Safepoint placed between stack pointer increment and decrement leads * to interpreter's stack corruption after deoptimization. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.* - * compiler.c2.cr6589834.Test_ia32 - * compiler.c2.cr6589834.InlinedArrayCloneTestCase + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/c2/stemmer/Stemmer.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/c2/stemmer/Stemmer.java Fri Aug 19 14:35:15 2016 -0700 @@ -3,7 +3,7 @@ * @bug 7070134 * @summary Hotspot crashes with sigsegv from PorterStemmer * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run driver jdk.test.lib.FileInstaller words words * @run main/othervm -Xbatch compiler.c2.stemmer.Stemmer words
--- a/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from compiled to compiled using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from compiled to interpreted using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * @build compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from compiled to native using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @modules java.base/jdk.internal.misc * @summary check calls from compiled to compiled using InvokeInterface - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to compiled using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to compiled using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to compiled using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from interpreted to compiled using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from interpreted to interpreted using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from interpreted to native using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to compiled using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to native using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -24,8 +24,8 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / - * @build compiler.calls.common.InvokeSpecial + * @library /test/lib / + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,7 +25,7 @@ * @test * @summary check calls from interpreted to native using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * * @build compiler.calls.common.InvokeSpecial * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to compiled using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to native using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to compiled using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to native using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to compiled using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to interpreted using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to native using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to compiled using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to interpreted using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to native using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to compiled using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,8 +25,8 @@ * @test * @summary check calls from native to interpreted using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / - * @build compiler.calls.common.InvokeVirtual + * @library /test/lib / + * @build sun.hotspot.WhiteBox * * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to native using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,7 +25,7 @@ * @test TestAnonymousClassUnloading * @bug 8054402 * @summary "Tests unloading of anonymous classes." - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @bug 8029443 * @summary Tests the unloading of methods to to class unloading * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.classUnloading.methodUnloading.TestMethodUnloading + * @build sun.hotspot.WhiteBox * compiler.classUnloading.methodUnloading.WorkerClass * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -26,7 +26,7 @@ * @bug 8013496 * @summary Test checks that the order in which ReversedCodeCacheSize and * InitialCodeCacheSize are passed to the VM is irrelevant. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -35,8 +35,8 @@ package compiler.codecache; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckReservedInitialCodeCacheSizeArgOrder { public static void main(String[] args) throws Exception {
--- a/test/compiler/codecache/CheckSegmentedCodeCache.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/CheckSegmentedCodeCache.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,11 +25,11 @@ * @test CheckSegmentedCodeCache * @bug 8015774 * @summary Checks VM options related to the segmented code cache - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.CheckSegmentedCodeCache + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -39,9 +39,9 @@ package compiler.codecache; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; import sun.hotspot.WhiteBox; public class CheckSegmentedCodeCache {
--- a/test/compiler/codecache/CheckUpperLimit.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/CheckUpperLimit.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -25,7 +25,7 @@ * @test * @bug 8015635 * @summary Test ensures that the ReservedCodeCacheSize is at most MAXINT - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.codecache; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckUpperLimit { public static void main(String[] args) throws Exception {
--- a/test/compiler/codecache/OverflowCodeCacheTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/OverflowCodeCacheTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @test OverflowCodeCacheTest * @bug 8059550 * @summary testing of code cache segments overflow - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.OverflowCodeCacheTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,20 +25,19 @@ * @test * @bug 8015774 * @summary Verify SegmentedCodeCache option's processing - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build jdk.test.lib.* * @run driver compiler.codecache.cli.TestSegmentedCodeCacheOption */ package compiler.codecache.cli; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType;
--- a/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,7 +25,7 @@ import compiler.codecache.cli.common.CodeCacheCLITestCase; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType;
--- a/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,7 +25,7 @@ import compiler.codecache.cli.common.CodeCacheCLITestCase; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType;
--- a/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,13 +25,12 @@ * @test * @bug 8015774 * @summary Verify processing of options related to code heaps sizing. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build compiler.codecache.cli.codeheapsize.TestCodeHeapSizeOptions jdk.test.lib.* * @run driver/timeout=240 compiler.codecache.cli.codeheapsize.TestCodeHeapSizeOptions */
--- a/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,7 +26,7 @@ import compiler.codecache.cli.common.CodeCacheCLITestCase; import compiler.codecache.cli.common.CodeCacheInfoFormatter; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType;
--- a/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,13 +25,12 @@ * @test * @bug 8015774 * @summary Verify that PrintCodeCache option print correct information. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build jdk.test.lib.* compiler.codecache.cli.common.* * @run main/timeout=240 compiler.codecache.cli.printcodecache.TestPrintCodeCacheOption */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/codecache/dtrace/DtraceResultsAnalyzer.java Fri Aug 19 14:35:15 2016 -0700 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2014, 2016, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package compiler.codecache.dtrace; + +import jdk.test.lib.process.OutputAnalyzer; + +public interface DtraceResultsAnalyzer { + public void analyze(OutputAnalyzer oa, String logFilePath); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/compiler/codecache/dtrace/DtraceRunner.java Fri Aug 19 14:35:15 2016 -0700 @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2014, 2016, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package compiler.codecache.dtrace; + +import jdk.test.lib.Asserts; +import jdk.test.lib.process.OutputAnalyzer; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class DtraceRunner { + + private static final String DTRACE_DEFAULT_PATH = "/usr/sbin/dtrace"; + private static final String DTRACE_PATH_PROPERTY + = "com.oracle.test.dtrace.path"; + private static final String OUTPUT_FILE_DTRACE_OPTION = "o"; + private static final String RUN_COMMAND_DTRACE_OPTION = "c"; + private static final String RUN_SCRIPT_DTRACE_OPTION = "s"; + private static final String ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION = "Z"; + private static final String DTRACE_OPTION_PREFIX = "-"; + public static final String PERMIT_DESTRUCTIVE_ACTIONS_DTRACE_OPTION = "w"; + public static final String DTRACE_OUT_LOG = "dtrace.out"; + + private final String dtraceExecutable; + + public DtraceRunner() { + dtraceExecutable = getDtracePath(); + } + + private List<String> getLaunchCmd(String java, String javaOpts, + String execClass, String testArgs, String dtraceScript, + String dtraceAddOpts) { + Asserts.assertTrue(!java.matches("\\s"), "Current dtrace implementation" + + " can't handle whitespaces in application path"); + List<String> result = new ArrayList<>(); + result.add(dtraceExecutable); + result.add(DTRACE_OPTION_PREFIX + System.getProperty("sun.arch.data.model")); + result.add(DTRACE_OPTION_PREFIX + + ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION + + ((dtraceAddOpts == null) ? "" : dtraceAddOpts) + + RUN_SCRIPT_DTRACE_OPTION); // run_script should be last one + result.add(dtraceScript); + result.add(DTRACE_OPTION_PREFIX + OUTPUT_FILE_DTRACE_OPTION); + result.add(DTRACE_OUT_LOG); + result.add(DTRACE_OPTION_PREFIX + RUN_COMMAND_DTRACE_OPTION); + result.add(java + " " + javaOpts + " " + execClass + " " + testArgs); + return result; + } + + private void backupLogFile(File file) { + if (file.exists()) { + file.renameTo(new File(file.getPath() + ".bak")); + } + } + + public void runDtrace(String java, String javaOpts, String execClass, + String testArgs, String dtraceScript, String dtraceAddOpts, + DtraceResultsAnalyzer analyzer) { + backupLogFile(new File(DTRACE_OUT_LOG)); + ProcessBuilder pbuilder = new ProcessBuilder( + getLaunchCmd(java, javaOpts, execClass, testArgs, + dtraceScript, dtraceAddOpts)); + OutputAnalyzer oa; + try { + oa = new OutputAnalyzer(pbuilder.start()); + } catch (IOException e) { + throw new Error("TESTBUG: Can't start process", e); + } + analyzer.analyze(oa, DTRACE_OUT_LOG); + } + + public static boolean dtraceAvailable() { + String path = getDtracePath(); + if (path == null) { + return false; + } + // now we'll launch dtrace to trace itself just to be sure it works + // and have all additional previleges set + ProcessBuilder pbuilder = new ProcessBuilder(path, path); + try { + OutputAnalyzer oa = new OutputAnalyzer(pbuilder.start()); + if (oa.getExitValue() != 0) { + return false; + } + } catch (IOException e) { + throw new Error("Couldn't launch dtrace", e); + } + return true; + } + + private static String getDtracePath() { + String propPath = System.getProperty(DTRACE_PATH_PROPERTY); + if (propPath != null && new File(propPath).exists()) { + return propPath; + } else if (new File(DTRACE_DEFAULT_PATH).exists()) { + return DTRACE_DEFAULT_PATH; + } + return null; + } +}
--- a/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,9 +27,9 @@ * @summary testing of dtrace for segmented code cache * @requires os.family=="solaris" * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.dtrace.SegmentedCodeCacheDtraceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. @@ -42,10 +42,8 @@ import compiler.testlibrary.CompilerUtils; import jdk.test.lib.Asserts; import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; -import jdk.test.lib.dtrace.DtraceResultsAnalyzer; -import jdk.test.lib.dtrace.DtraceRunner; import java.io.IOException; import java.lang.reflect.Executable;
--- a/test/compiler/codecache/jmx/BeanTypeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/BeanTypeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @summary verify types of code cache memory pool bean * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.BeanTypeTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/CodeCacheUtils.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/CodeCacheUtils.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -119,6 +119,28 @@ } } + /** + * Verifies that 'newValue' is equal to 'oldValue' if usage of the + * corresponding code heap is predictable. Checks the weaker condition + * 'newValue <= oldValue' if usage is not predictable because intermediate + * allocations may happen. + * + * @param btype BlobType of the code heap to be checked + * @param newValue New value to be verified + * @param oldValue Old value to be verified + * @param msg Error message if verification fails + */ + public static void assertEQorLTE(BlobType btype, long newValue, long oldValue, String msg) { + if (CodeCacheUtils.isCodeHeapPredictable(btype)) { + // Usage is predictable, check strong == condition + Asserts.assertEQ(newValue, oldValue, msg); + } else { + // Usage is not predictable, check weaker <= condition + Asserts.assertLTE(newValue, oldValue, msg); + } + } + + public static void disableCollectionUsageThresholds() { BlobType.getAvailable().stream() .map(BlobType::getMemoryPool)
--- a/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @summary verify CodeHeap bean presence * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.CodeHeapBeanPresenceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/GetUsageTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/GetUsageTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @summary testing of getUsage() for segmented code cache * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.jmx.GetUsageTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -26,9 +26,9 @@ * @summary testing of initial and max usage * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.jmx.InitialAndMaxUsageTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing
--- a/test/compiler/codecache/jmx/ManagerNamesTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/ManagerNamesTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @summary verify getMemoryManageNames calls in case of segmented code cache * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.ManagerNamesTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @summary verify that MemoryManagerMXBean exists for every code cache segment * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.MemoryPoolsPresenceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/PeakUsageTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/PeakUsageTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -23,12 +23,11 @@ /* * @test PeakUsageTest - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @ignore 8151345 - * @build ompiler.codecache.jmx.PeakUsageTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -69,9 +68,17 @@ bean.resetPeakUsage(); long addr = CodeCacheUtils.WB.allocateCodeBlob( CodeCacheUtils.ALLOCATION_SIZE, btype.id); - long newPeakUsage = bean.getPeakUsage().getUsed(); + try { - CodeCacheUtils.assertEQorGTE(btype, newPeakUsage, bean.getUsage().getUsed(), + /* + Always save peakUsage after saving currentUsage. Reversing the order + can lead to inconsistent results (currentUsage > peakUsage) because + of intermediate allocations. + */ + long currUsage = bean.getUsage().getUsed(); + long peakUsage = bean.getPeakUsage().getUsed(); + CodeCacheUtils.assertEQorLTE(btype, currUsage, + peakUsage, "Peak usage does not match usage after allocation for " + bean.getName()); } finally { @@ -79,19 +86,21 @@ CodeCacheUtils.WB.freeCodeBlob(addr); } } - CodeCacheUtils.assertEQorGTE(btype, newPeakUsage, bean.getPeakUsage().getUsed(), - "Code cache peak usage has changed after usage decreased for " - + bean.getName()); bean.resetPeakUsage(); - CodeCacheUtils.assertEQorGTE(btype, bean.getPeakUsage().getUsed(), - bean.getUsage().getUsed(), + long currUsage = bean.getUsage().getUsed(); + long peakUsage = bean.getPeakUsage().getUsed(); + CodeCacheUtils.assertEQorLTE(btype, currUsage, + peakUsage, "Code cache peak usage is not equal to usage after reset for " + bean.getName()); long addr2 = CodeCacheUtils.WB.allocateCodeBlob( CodeCacheUtils.ALLOCATION_SIZE, btype.id); try { - CodeCacheUtils.assertEQorGTE(btype, bean.getPeakUsage().getUsed(), - bean.getUsage().getUsed(), + currUsage = bean.getUsage().getUsed(); + peakUsage = bean.getPeakUsage().getUsed(); + + CodeCacheUtils.assertEQorLTE(btype, currUsage, + peakUsage, "Code cache peak usage is not equal to usage after fresh " + "allocation for " + bean.getName()); } finally {
--- a/test/compiler/codecache/jmx/PoolsIndependenceTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/PoolsIndependenceTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,9 +26,9 @@ * @summary testing of getUsageThreshold() * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.jmx.PoolsIndependenceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/ThresholdNotificationsTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/ThresholdNotificationsTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -24,11 +24,11 @@ /* * @test ThresholdNotificationsTest * @summary testing of getUsageThreshold() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.jmx.ThresholdNotificationsTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing
--- a/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test UsageThresholdExceededSeveralTimesTest * @summary verifying that getUsageThresholdCount() returns correct value * after threshold has been hit several times - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.jmx.UsageThresholdExceededTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/UsageThresholdExceededTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/UsageThresholdExceededTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test UsageThresholdExceededTest * @summary verifying that getUsageThresholdCount() returns correct value * after threshold has been hit - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.jmx.UsageThresholdExceededTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,11 +25,10 @@ * @test UsageThresholdIncreasedTest * @summary verifying that threshold hasn't been hit after allocation smaller * than threshold value and that threshold value can be changed - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * - * @build compiler.codecache.jmx.UsageThresholdIncreasedTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,13 +25,13 @@ * @test UsageThresholdNotExceededTest * @summary verifying that usage threshold not exceeded while allocating less * than usage threshold - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission - * @build compiler.codecache.jmx.UsageThresholdNotExceededTest * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:-UseCodeCacheFlushing -XX:-MethodFlushing * -XX:CompileCommand=compileonly,null::*
--- a/test/compiler/codecache/stress/CodeCacheStressRunner.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/stress/CodeCacheStressRunner.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -24,7 +24,7 @@ package compiler.codecache.stress; -import jdk.test.lib.TimeLimitedRunner; +import jdk.test.lib.wrappers.TimeLimitedRunner; import jdk.test.lib.Utils; public class CodeCacheStressRunner {
--- a/test/compiler/codecache/stress/Helper.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/stress/Helper.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,7 +26,7 @@ import jdk.test.lib.Asserts; import jdk.test.lib.ByteCodeLoader; -import jdk.test.lib.InfiniteLoop; +import jdk.test.lib.wrappers.InfiniteLoop; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox;
--- a/test/compiler/codecache/stress/OverloadCompileQueueTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/stress/OverloadCompileQueueTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,12 +25,12 @@ /* * @test OverloadCompileQueueTest * @summary stressing code cache by overloading compile queues - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * * @ignore 8071905 - * @build compiler.codecache.stress.OverloadCompileQueueTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/stress/RandomAllocationTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/stress/RandomAllocationTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @test RandomAllocationTest * @key stress * @summary stressing code cache by allocating randomly sized "dummy" code blobs - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.stress.RandomAllocationTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,11 +26,11 @@ * @test UnexpectedDeoptimizationTest * @key stress * @summary stressing code cache by forcing unexpected deoptimizations - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.stress.UnexpectedDeoptimizationTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/codegen/Test6823354.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codegen/Test6823354.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -26,7 +26,7 @@ * @bug 6823354 * @summary These methods can be instrinsified by using bit scan, bit test, and population count instructions. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.codegen.Test6823354::lzcomp
--- a/test/compiler/codegen/Test6896617.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codegen/Test6896617.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -25,7 +25,7 @@ * @test * @bug 6896617 * @summary Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() with SSE instructions on x86 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.base/sun.nio.cs * java.management
--- a/test/compiler/codegen/Test7100757.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codegen/Test7100757.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, 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 @@ -26,7 +26,7 @@ * @test * @bug 7100757 * @summary The BitSet.nextSetBit() produces incorrect result in 32bit VM on Sparc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management *
--- a/test/compiler/codegen/aes/TestAESMain.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/codegen/aes/TestAESMain.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, 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 @@ -27,7 +27,7 @@ * @bug 7184394 * @key stress * @summary add intrinsics to use AES instructions - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management *
--- a/test/compiler/compilercontrol/InlineMatcherTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/InlineMatcherTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,9 +26,9 @@ * @bug 8074095 * @summary Testing of compiler/InlineMatcher * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.compilercontrol.InlineMatcherTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,16 +25,12 @@ * @test TestCompilerDirectivesCompatibilityBase * @bug 8137167 * @summary Test compiler control compatibility with compile command - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityBase + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,16 +25,12 @@ * @test TestCompilerDirectivesCompatibilityCommandOff * @bug 8137167 * @summary Test compiler control compatibility with compile command - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityCommandOff + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,16 +25,12 @@ * @test TestCompilerDirectivesCompatibilityCommandOn * @bug 8137167 * @summary Test compiler control compatibility with compile command - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityCommandOn + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -24,16 +24,12 @@ /* * @test TestCompilerDirectivesCompatibilityFlag * @bug 8137167 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityFlag + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=compileonly * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.CompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.CompileOnlyTest
--- a/test/compiler/compilercontrol/commandfile/ExcludeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commandfile/ExcludeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=exclude * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.ExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.ExcludeTest
--- a/test/compiler/compilercontrol/commandfile/LogTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commandfile/LogTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=log * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.LogTest
--- a/test/compiler/compilercontrol/commandfile/PrintTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commandfile/PrintTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=print * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.PrintTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.PrintTest
--- a/test/compiler/compilercontrol/commands/CompileOnlyTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commands/CompileOnlyTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=compileonly * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.CompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.CompileOnlyTest
--- a/test/compiler/compilercontrol/commands/ExcludeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commands/ExcludeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=exclude * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.ExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.ExcludeTest
--- a/test/compiler/compilercontrol/commands/LogTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commands/LogTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=log * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.LogTest
--- a/test/compiler/compilercontrol/commands/PrintTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/commands/PrintTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=print * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.PrintTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.PrintTest
--- a/test/compiler/compilercontrol/directives/CompileOnlyTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/directives/CompileOnlyTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to compile only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.CompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.CompileOnlyTest
--- a/test/compiler/compilercontrol/directives/ExcludeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/directives/ExcludeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to exclude methods from compilation * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.ExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.ExcludeTest
--- a/test/compiler/compilercontrol/directives/LogTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/directives/LogTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to turn on LogCompilation * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.LogTest
--- a/test/compiler/compilercontrol/directives/PrintTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/directives/PrintTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to turn on print_assembly * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.PrintTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.PrintTest
--- a/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to add and remove directives * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddAndRemoveTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddAndRemoveTest
--- a/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to compile only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddCompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddCompileOnlyTest
--- a/test/compiler/compilercontrol/jcmd/AddExcludeTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/AddExcludeTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to exclude only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddExcludeTest
--- a/test/compiler/compilercontrol/jcmd/AddLogTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/AddLogTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to log only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddLogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddLogTest
--- a/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -27,14 +27,9 @@ * @summary Tests jcmd to be able to add a directive to print assembly * only for specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddPrintAssemblyTest
--- a/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,15 +26,10 @@ * @bug 8137167 * @summary Tests jcmd to be able to clear directives added via options * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @ignore 8140405 - * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
--- a/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests clear JCMD command * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.ClearDirectivesStackTest
--- a/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,15 +26,10 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to compile only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * @requires vm.flavor != "minimal" * - * @build compiler.compilercontrol.jcmd.PrintDirectivesTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.PrintDirectivesTest
--- a/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,8 +28,8 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.Executor; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.TimeLimitedRunner; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.wrappers.TimeLimitedRunner; import jdk.test.lib.Utils; import java.util.ArrayList;
--- a/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -27,14 +27,9 @@ * @summary Tests jcmd to be able to add a lot of huge directive files with * parallel executed jcmds until timeout has reached * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
--- a/test/compiler/compilercontrol/logcompilation/LogTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/logcompilation/LogTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests LogCompilation executed standalone without log commands or directives * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.logcompilation.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.logcompilation.LogTest
--- a/test/compiler/compilercontrol/matcher/MethodMatcherTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/matcher/MethodMatcherTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,9 +26,9 @@ * @bug 8135068 * @summary Tests CompilerCommand's method matcher * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.matcher.MethodMatcherTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -40,7 +40,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import sun.hotspot.WhiteBox; import java.lang.reflect.Executable;
--- a/test/compiler/compilercontrol/mixed/RandomCommandsTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/mixed/RandomCommandsTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Randomly generates commands with random types * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.mixed.RandomCommandsTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
--- a/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Randomly generates valid commands with random types * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.mixed.RandomValidCommandsTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
--- a/test/compiler/compilercontrol/parser/DirectiveParserTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/parser/DirectiveParserTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,7 +26,7 @@ * @bug 8137167 * @summary Tests directive json parser * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @run driver compiler.compilercontrol.parser.DirectiveParserTest */ @@ -35,7 +35,7 @@ import compiler.compilercontrol.share.JSONFile; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; public class DirectiveParserTest {
--- a/test/compiler/compilercontrol/parser/DirectiveStressTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/parser/DirectiveStressTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,7 +26,7 @@ * @bug 8137167 * @summary Stress directive json parser * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @run driver compiler.compilercontrol.parser.DirectiveStressTest */ @@ -38,7 +38,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.DirectiveWriter; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.util.List; import java.util.stream.Collectors;
--- a/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -27,8 +27,8 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.scenario.DirectiveWriter; import compiler.compilercontrol.share.scenario.Scenario; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import java.util.EnumSet;
--- a/test/compiler/compilercontrol/share/AbstractTestBase.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/AbstractTestBase.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,7 +26,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.List;
--- a/test/compiler/compilercontrol/share/actions/BaseAction.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/actions/BaseAction.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,8 +25,8 @@ import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.State; -import jdk.test.lib.Pair; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.util.Pair; +import jdk.test.lib.process.ProcessTools; import java.io.BufferedReader; import java.io.IOException;
--- a/test/compiler/compilercontrol/share/actions/CompileAction.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/actions/CompileAction.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -27,7 +27,7 @@ import compiler.compilercontrol.share.scenario.State; import compiler.testlibrary.CompilerUtils; import jdk.test.lib.Asserts; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox;
--- a/test/compiler/compilercontrol/share/method/MethodDescriptor.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/method/MethodDescriptor.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -23,7 +23,7 @@ package compiler.compilercontrol.share.method; -import jdk.test.lib.Triple; +import jdk.test.lib.util.Triple; import java.lang.reflect.Executable; import java.util.function.Function;
--- a/test/compiler/compilercontrol/share/method/MethodGenerator.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/method/MethodGenerator.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,8 +26,8 @@ import compiler.compilercontrol.share.method.MethodDescriptor.PatternType; import compiler.compilercontrol.share.method.MethodDescriptor.Separator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; -import jdk.test.lib.Triple; +import jdk.test.lib.util.Pair; +import jdk.test.lib.util.Triple; import jdk.test.lib.Utils; import java.lang.reflect.Executable;
--- a/test/compiler/compilercontrol/share/pool/MethodHolder.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/pool/MethodHolder.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -23,7 +23,7 @@ package compiler.compilercontrol.share.pool; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.lang.reflect.Method;
--- a/test/compiler/compilercontrol/share/pool/PoolHelper.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/pool/PoolHelper.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -23,7 +23,7 @@ package compiler.compilercontrol.share.pool; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList;
--- a/test/compiler/compilercontrol/share/pool/SubMethodHolder.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/pool/SubMethodHolder.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,6 +1,6 @@ package compiler.compilercontrol.share.pool; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Constructor; import java.lang.reflect.Executable;
--- a/test/compiler/compilercontrol/share/processors/CommandProcessor.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/processors/CommandProcessor.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,7 +25,7 @@ import compiler.compilercontrol.share.scenario.CompileCommand; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.util.Iterator; import java.util.List;
--- a/test/compiler/compilercontrol/share/processors/LogProcessor.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/processors/LogProcessor.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,7 +28,7 @@ import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.State; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; import java.io.FileNotFoundException;
--- a/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,7 +26,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.scenario.CompileCommand; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.util.ArrayList; import java.util.Iterator;
--- a/test/compiler/compilercontrol/share/processors/PrintProcessor.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/processors/PrintProcessor.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,7 +28,7 @@ import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.State; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.lang.management.ManagementFactory; import java.lang.reflect.Executable;
--- a/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,7 +25,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList;
--- a/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -27,7 +27,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList;
--- a/test/compiler/compilercontrol/share/scenario/Executor.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/scenario/Executor.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,8 +25,8 @@ import compiler.compilercontrol.share.actions.BaseAction; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor;
--- a/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,7 +26,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList;
--- a/test/compiler/compilercontrol/share/scenario/Scenario.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/compilercontrol/share/scenario/Scenario.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -30,8 +30,8 @@ import compiler.compilercontrol.share.processors.PrintDirectivesProcessor; import compiler.compilercontrol.share.processors.PrintProcessor; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.Pair; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList;
--- a/test/compiler/cpuflags/RestoreMXCSR.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/cpuflags/RestoreMXCSR.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -25,7 +25,7 @@ * @test * @bug 8020433 * @summary Crash when using -XX:+RestoreMXCSROnJNICalls - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.cpuflags; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class RestoreMXCSR { public static void main(String[] args) throws Exception {
--- a/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -24,12 +24,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * @ignore 8146128 - * @build compiler.cpuflags.TestAESIntrinsicsOnSupportedConfig - * compiler.codegen.aes.TestAESMain + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -39,9 +38,9 @@ package compiler.cpuflags; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class TestAESIntrinsicsOnSupportedConfig extends AESIntrinsicsBase {
--- a/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -24,12 +24,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.cpuflags.TestAESIntrinsicsOnUnsupportedConfig - * compiler.codegen.aes.TestAESMain + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -39,8 +38,8 @@ package compiler.cpuflags; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.cli.predicate.NotPredicate; public class TestAESIntrinsicsOnUnsupportedConfig extends AESIntrinsicsBase {
--- a/test/compiler/debug/VerifyAdapterSharing.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/debug/VerifyAdapterSharing.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -25,7 +25,7 @@ * @test * @bug 8030783 * @summary Regression test for 8026478 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.debug; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class VerifyAdapterSharing { public static void main(String[] args) throws Exception {
--- a/test/compiler/eliminateAutobox/UnsignedLoads.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/eliminateAutobox/UnsignedLoads.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,7 +26,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox * -XX:CompileOnly=::valueOf,::byteValue,::shortValue,::testUnsignedByte,::testUnsignedShort
--- a/test/compiler/floatingpoint/TestPow2.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/floatingpoint/TestPow2.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8063086 * @summary X^2 special case for C2 yields different result than interpreter - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.floatingpoint.TestPow2 + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/gcbarriers/PreserveFPRegistersTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/gcbarriers/PreserveFPRegistersTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -26,7 +26,7 @@ * @test * @bug 8148175 * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xmx300m -XX:+UseG1GC * compiler.gcbarriers.PreserveFPRegistersTest
--- a/test/compiler/inlining/InlineAccessors.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/inlining/InlineAccessors.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,15 +26,15 @@ * @bug 8140650 * @summary Method::is_accessor should cover getters and setters for all types * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run driver compiler.inlining.InlineAccessors */ package compiler.inlining; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class InlineAccessors { public static void main(String[] args) throws Exception {
--- a/test/compiler/interpreter/DisableOSRTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/interpreter/DisableOSRTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -26,7 +26,7 @@ * @bug 8159620 * @summary testing that -XX:-UseOnStackReplacement works with both -XX:(+/-)TieredCompilation * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/IntrinsicAvailableTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/IntrinsicAvailableTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,9 +25,9 @@ * @test * @bug 8130832 * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.intrinsics.IntrinsicAvailableTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:.
--- a/test/compiler/intrinsics/IntrinsicDisabledTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/IntrinsicDisabledTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -25,9 +25,9 @@ * @test * @bug 8138651 * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.intrinsics.IntrinsicDisabledTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:.
--- a/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -28,9 +28,9 @@ * @summary Verify that the Montgomery multiply and square intrinsic works and correctly checks their arguments. * @requires vm.flavor == "server" * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.intrinsics.bigInteger.MontgomeryMultiplyTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/BMITestRunner.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/BMITestRunner.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,8 +25,8 @@ package compiler.intrinsics.bmi; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import java.io.IOException;
--- a/test/compiler/intrinsics/bmi/TestAndnI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestAndnI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,12 +27,10 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of ANDN instruction - * @library /testlibrary /test/lib + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.intrinsics.bmi.TestAndnI - * compiler.intrinsics.bmi.BMITestRunner - * compiler.intrinsics.bmi.Expr + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestAndnL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestAndnL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of ANDN instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestAndnL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestBlsiI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestBlsiI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSI instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsiI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestBlsiL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestBlsiL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSI instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsiL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestBlsmskI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestBlsmskI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSMSK instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsmskI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestBlsmskL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestBlsmskL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSMSK instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsmskL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestBlsrI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestBlsrI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSR instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsrI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestBlsrL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestBlsrL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSR instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsrL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestLzcntI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestLzcntI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestLzcntI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestLzcntL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestLzcntL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestLzcntL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestTzcntI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestTzcntI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestTzcntI BMITestRunner Expr + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/TestTzcntL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/TestTzcntL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestTzcntL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.AndnTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java Fri Aug 19 14:35:15 2016 -0700 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.AndnTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsiTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsiTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsmskTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsmskTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsrTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsrTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.LZcntTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.LZcntTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java Fri Aug 19 08:34:30 2016 +0200 +++ b/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java Fri Aug 19 14:35:15 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.TZcntTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI