--- a/.hgtags Sat Aug 10 07:33:52 2019 -0400
+++ b/.hgtags Sat Aug 10 10:02:54 2019 -0400
@@ -579,4 +579,5 @@
28ab01c067551ef158abaef08e154e1051ca0893 jdk-14+7
929f37a9c35d530d4e866f6e832001aeb4cfb371 jdk-13+32
c0023e364b6f130cb1e93747b796d8718d544db1 jdk-14+8
+9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13+33
18f189e69b29f8215a3500b875127ed4fb2d977a jdk-14+9
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -473,7 +473,7 @@
__ if_then(card_val, BoolTest::ne, young_card, unlikely); {
kit->sync_kit(ideal);
- kit->insert_store_load_for_barrier();
+ kit->insert_mem_bar(Op_MemBarVolatile, oop_store);
__ sync_kit(kit);
Node* card_val_reload = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -105,7 +105,7 @@
if (UseCondCardMark) {
if (ct->scanned_concurrently()) {
- kit->insert_store_load_for_barrier();
+ kit->insert_mem_bar(Op_MemBarVolatile, oop_store);
__ sync_kit(kit);
}
// The classic GC reference write barrier is typically implemented
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -3093,6 +3093,8 @@
needs_barrier_impl(phase, n->in(3), visited);
case Op_ShenandoahEnqueueBarrier:
return needs_barrier_impl(phase, n->in(1), visited);
+ case Op_CreateEx:
+ return false;
default:
break;
}
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -516,7 +516,7 @@
elapsedTimer sample_time;
sample_time.start();
{
- MutexLocker tlock(Threads_lock, Mutex::_no_safepoint_check_flag);
+ MutexLocker tlock(Threads_lock);
ThreadsListHandle tlh;
// Resolve a sample session relative start position index into the thread list array.
// In cases where the last sampled thread is NULL or not-NULL but stale, find_index() returns -1.
--- a/src/hotspot/share/opto/graphKit.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/opto/graphKit.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -3306,18 +3306,6 @@
return membar;
}
-void GraphKit::insert_store_load_for_barrier() {
- Node* mem = reset_memory();
- MemBarNode* mb = MemBarNode::make(C, Op_MemBarVolatile, Compile::AliasIdxRaw);
- mb->init_req(TypeFunc::Control, control());
- mb->init_req(TypeFunc::Memory, mem);
- Node* membar = _gvn.transform(mb);
- set_control(_gvn.transform(new ProjNode(membar, TypeFunc::Control)));
- Node* newmem = _gvn.transform(new ProjNode(membar, TypeFunc::Memory));
- set_all_memory(mem);
- set_memory(newmem, Compile::AliasIdxRaw);
-}
-
//------------------------------shared_lock------------------------------------
// Emit locking code.
FastLockNode* GraphKit::shared_lock(Node* obj) {
--- a/src/hotspot/share/opto/graphKit.hpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/opto/graphKit.hpp Sat Aug 10 10:02:54 2019 -0400
@@ -811,7 +811,6 @@
int next_monitor();
Node* insert_mem_bar(int opcode, Node* precedent = NULL);
Node* insert_mem_bar_volatile(int opcode, int alias_idx, Node* precedent = NULL);
- void insert_store_load_for_barrier();
// Optional 'precedent' is appended as an extra edge, to force ordering.
FastLockNode* shared_lock(Node* obj);
void shared_unlock(Node* box, Node* obj);
--- a/src/hotspot/share/prims/jni.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/prims/jni.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -4135,14 +4135,13 @@
thread->cache_global_variables();
- // Crucial that we do not have a safepoint check for this thread, since it has
+ // This thread will not do a safepoint check, since it has
// not been added to the Thread list yet.
- { Threads_lock->lock_without_safepoint_check();
+ { MutexLocker ml(Threads_lock);
// This must be inside this lock in order to get FullGCALot to work properly, i.e., to
// avoid this thread trying to do a GC before it is added to the thread-list
thread->set_active_handles(JNIHandleBlock::allocate_block());
Threads::add(thread, daemon);
- Threads_lock->unlock();
}
// Create thread group and name info from attach arguments
oop group = NULL;
--- a/src/hotspot/share/runtime/handshake.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/handshake.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -137,7 +137,7 @@
// There is an assumption in the code that the Threads_lock should be
// locked during certain phases.
{
- MutexLocker ml(Threads_lock, Mutex::_no_safepoint_check_flag);
+ MutexLocker ml(Threads_lock);
_target->handshake_process_by_vmthread();
}
} while (!poll_for_completed_thread());
@@ -186,7 +186,7 @@
// There is an assumption in the code that the Threads_lock should
// be locked during certain phases.
jtiwh.rewind();
- MutexLocker ml(Threads_lock, Mutex::_no_safepoint_check_flag);
+ MutexLocker ml(Threads_lock);
for (JavaThread *thr = jtiwh.next(); thr != NULL; thr = jtiwh.next()) {
// A new thread on the ThreadsList will not have an operation,
// hence it is skipped in handshake_process_by_vmthread.
--- a/src/hotspot/share/runtime/jniHandles.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/jniHandles.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -347,6 +347,24 @@
JNIHandleBlock* JNIHandleBlock::_block_list = NULL;
#endif
+static inline bool is_tagged_free_list(uintptr_t value) {
+ return (value & 1u) != 0;
+}
+
+static inline uintptr_t tag_free_list(uintptr_t value) {
+ return value | 1u;
+}
+
+static inline uintptr_t untag_free_list(uintptr_t value) {
+ return value & ~(uintptr_t)1u;
+}
+
+// There is a freelist of handles running through the JNIHandleBlock
+// with a tagged next pointer, distinguishing these next pointers from
+// oops. The freelist handling currently relies on the size of oops
+// being the same as a native pointer. If this ever changes, then
+// this freelist handling must change too.
+STATIC_ASSERT(sizeof(oop) == sizeof(uintptr_t));
#ifdef ASSERT
void JNIHandleBlock::zap() {
@@ -355,7 +373,7 @@
for (int index = 0; index < block_size_in_oops; index++) {
// NOT using Access here; just bare clobbering to NULL, since the
// block no longer contains valid oops.
- _handles[index] = NULL;
+ _handles[index] = 0;
}
}
#endif // ASSERT
@@ -459,11 +477,12 @@
assert(current == current_chain || current->pop_frame_link() == NULL,
"only blocks first in chain should have pop frame link set");
for (int index = 0; index < current->_top; index++) {
- oop* root = &(current->_handles)[index];
- oop value = *root;
+ uintptr_t* addr = &(current->_handles)[index];
+ uintptr_t value = *addr;
// traverse heap pointers only, not deleted handles or free list
// pointers
- if (value != NULL && Universe::heap()->is_in_reserved(value)) {
+ if (value != 0 && !is_tagged_free_list(value)) {
+ oop* root = (oop*)addr;
f->do_oop(root);
}
}
@@ -509,15 +528,15 @@
// Try last block
if (_last->_top < block_size_in_oops) {
- oop* handle = &(_last->_handles)[_last->_top++];
+ oop* handle = (oop*)&(_last->_handles)[_last->_top++];
NativeAccess<IS_DEST_UNINITIALIZED>::oop_store(handle, obj);
return (jobject) handle;
}
// Try free list
if (_free_list != NULL) {
- oop* handle = _free_list;
- _free_list = (oop*) *_free_list;
+ oop* handle = (oop*)_free_list;
+ _free_list = (uintptr_t*) untag_free_list(*_free_list);
NativeAccess<IS_DEST_UNINITIALIZED>::oop_store(handle, obj);
return (jobject) handle;
}
@@ -550,10 +569,10 @@
int blocks = 0;
for (JNIHandleBlock* current = this; current != NULL; current = current->_next) {
for (int index = 0; index < current->_top; index++) {
- oop* handle = &(current->_handles)[index];
- if (*handle == NULL) {
+ uintptr_t* handle = &(current->_handles)[index];
+ if (*handle == 0) {
// this handle was cleared out by a delete call, reuse it
- *handle = (oop) _free_list;
+ *handle = _free_list == NULL ? 0 : tag_free_list((uintptr_t)_free_list);
_free_list = handle;
free++;
}
--- a/src/hotspot/share/runtime/jniHandles.hpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/jniHandles.hpp Sat Aug 10 10:02:54 2019 -0400
@@ -140,7 +140,7 @@
block_size_in_oops = 32 // Number of handles per handle block
};
- oop _handles[block_size_in_oops]; // The handles
+ uintptr_t _handles[block_size_in_oops]; // The handles
int _top; // Index of next unused handle
JNIHandleBlock* _next; // Link to next block
@@ -148,7 +148,7 @@
// Having two types of blocks complicates the code and the space overhead in negligible.
JNIHandleBlock* _last; // Last block in use
JNIHandleBlock* _pop_frame_link; // Block to restore on PopLocalFrame call
- oop* _free_list; // Handle free list
+ uintptr_t* _free_list; // Handle free list
int _allocate_before_rebuild; // Number of blocks to allocate before rebuilding free list
// Check JNI, "planned capacity" for current frame (or push/ensure)
--- a/src/hotspot/share/runtime/mutex.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/mutex.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -37,7 +37,7 @@
// If the JavaThread checks for safepoint, verify that the lock wasn't created with safepoint_check_never.
SafepointCheckRequired not_allowed = do_safepoint_check ? Monitor::_safepoint_check_never :
Monitor::_safepoint_check_always;
- assert(!thread->is_Java_thread() || _safepoint_check_required != not_allowed,
+ assert(!thread->is_active_Java_thread() || _safepoint_check_required != not_allowed,
"This lock should %s have a safepoint check for Java threads: %s",
_safepoint_check_required ? "always" : "never", name());
@@ -52,7 +52,7 @@
#ifdef CHECK_UNHANDLED_OOPS
// Clear unhandled oops in JavaThreads so we get a crash right away.
- if (self->is_Java_thread()) {
+ if (self->is_active_Java_thread()) {
self->clear_unhandled_oops();
}
#endif // CHECK_UNHANDLED_OOPS
@@ -62,6 +62,7 @@
Monitor* in_flight_monitor = NULL;
DEBUG_ONLY(int retry_cnt = 0;)
+ bool is_active_Java_thread = self->is_active_Java_thread();
while (!_lock.try_lock()) {
// The lock is contended
@@ -72,7 +73,8 @@
}
#endif // ASSERT
- if (self->is_Java_thread()) {
+ // Is it a JavaThread participating in the safepoint protocol.
+ if (is_active_Java_thread) {
assert(rank() > Mutex::special, "Potential deadlock with special or lesser rank mutex");
{ ThreadBlockInVMWithDeadlockCheck tbivmdc((JavaThread *) self, &in_flight_monitor);
in_flight_monitor = this; // save for ~ThreadBlockInVMWithDeadlockCheck
@@ -190,8 +192,8 @@
assert_owner(self);
- // Safepoint checking logically implies java_thread
- guarantee(self->is_Java_thread(), "invariant");
+ // Safepoint checking logically implies an active JavaThread.
+ guarantee(self->is_active_Java_thread(), "invariant");
assert_wait_lock_state(self);
#ifdef CHECK_UNHANDLED_OOPS
@@ -470,7 +472,7 @@
// Factored out common sanity checks for locking mutex'es. Used by lock() and try_lock()
void Monitor::check_prelock_state(Thread *thread, bool safepoint_check) {
if (safepoint_check) {
- assert((!thread->is_Java_thread() || ((JavaThread *)thread)->thread_state() == _thread_in_vm)
+ assert((!thread->is_active_Java_thread() || ((JavaThread *)thread)->thread_state() == _thread_in_vm)
|| rank() == Mutex::special, "wrong thread state for using locks");
if (thread->is_VM_thread() && !allow_vm_block()) {
fatal("VM thread using lock %s (not allowed to block on)", name());
--- a/src/hotspot/share/runtime/mutexLocker.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/mutexLocker.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -287,7 +287,7 @@
// CMS_bitMap_lock leaf 1
// CMS_freeList_lock leaf 2
- def(Threads_lock , PaddedMonitor, barrier, true, Monitor::_safepoint_check_sometimes); // Used for safepoint protocol.
+ def(Threads_lock , PaddedMonitor, barrier, true, Monitor::_safepoint_check_always); // Used for safepoint protocol.
def(NonJavaThreadsList_lock , PaddedMutex, leaf, true, Monitor::_safepoint_check_never);
def(NonJavaThreadsListSync_lock , PaddedMutex, leaf, true, Monitor::_safepoint_check_never);
--- a/src/hotspot/share/runtime/thread.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/thread.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -1804,7 +1804,7 @@
if (_terminated == _vm_exited) {
// _vm_exited is set at safepoint, and Threads_lock is never released
// we will block here forever
- Threads_lock->lock_without_safepoint_check();
+ Threads_lock->lock();
ShouldNotReachHere();
}
}
--- a/src/hotspot/share/runtime/thread.hpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/thread.hpp Sat Aug 10 10:02:54 2019 -0400
@@ -491,6 +491,10 @@
// Can this thread make Java upcalls
virtual bool can_call_java() const { return false; }
+ // Is this a JavaThread that is on the VM's current ThreadsList?
+ // If so it must participate in the safepoint protocol.
+ virtual bool is_active_Java_thread() const { return false; }
+
// Casts
virtual WorkerThread* as_Worker_thread() const { return NULL; }
@@ -1247,6 +1251,10 @@
virtual bool is_Java_thread() const { return true; }
virtual bool can_call_java() const { return true; }
+ virtual bool is_active_Java_thread() const {
+ return on_thread_list() && !is_terminated();
+ }
+
// Thread oop. threadObj() can be NULL for initial JavaThread
// (or for threads attached via JNI)
oop threadObj() const { return _threadObj; }
--- a/src/hotspot/share/runtime/threadSMR.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/threadSMR.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -942,9 +942,9 @@
while (true) {
{
- // No safepoint check because this JavaThread is not on the
- // Threads list.
- MutexLocker ml(Threads_lock, Mutex::_no_safepoint_check_flag);
+ // Will not make a safepoint check because this JavaThread
+ // is not on the current ThreadsList.
+ MutexLocker ml(Threads_lock);
// Cannot use a MonitorLocker helper here because we have
// to drop the Threads_lock first if we wait.
ThreadsSMRSupport::delete_lock()->lock_without_safepoint_check();
--- a/src/hotspot/share/runtime/vmOperations.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/runtime/vmOperations.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -522,7 +522,7 @@
Thread::current_or_null() != _shutdown_thread) {
// _vm_exited is set at safepoint, and the Threads_lock is never released
// we will block here until the process dies
- Threads_lock->lock_without_safepoint_check();
+ Threads_lock->lock();
ShouldNotReachHere();
}
}
--- a/src/hotspot/share/utilities/vmError.cpp Sat Aug 10 07:33:52 2019 -0400
+++ b/src/hotspot/share/utilities/vmError.cpp Sat Aug 10 10:02:54 2019 -0400
@@ -1797,11 +1797,14 @@
// Case 16 is tested by test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java.
// Case 17 is tested by test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java.
- // We grab Threads_lock to keep ThreadsSMRSupport::print_info_on()
+ // We try to grab Threads_lock to keep ThreadsSMRSupport::print_info_on()
// from racing with Threads::add() or Threads::remove() as we
// generate the hs_err_pid file. This makes our ErrorHandling tests
// more stable.
- MutexLocker ml(Threads_lock->owned_by_self() ? NULL : Threads_lock, Mutex::_no_safepoint_check_flag);
+ if (!Threads_lock->owned_by_self()) {
+ Threads_lock->try_lock();
+ // The VM is going to die so no need to unlock Thread_lock.
+ }
switch (how) {
case 1: vmassert(str == NULL, "expected null"); break;
--- a/src/java.base/share/classes/java/lang/StringLatin1.java Sat Aug 10 07:33:52 2019 -0400
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java Sat Aug 10 10:02:54 2019 -0400
@@ -177,7 +177,7 @@
char c1 = getChar(value, k);
char c2 = StringUTF16.getChar(other, k);
if (c1 != c2) {
- c1 = Character.toUpperCase(c1);
+ c1 = (char) CharacterDataLatin1.instance.toUpperCase(c1);
c2 = Character.toUpperCase(c2);
if (c1 != c2) {
c1 = Character.toLowerCase(c1);
@@ -391,8 +391,8 @@
if (c1 == c2) {
continue;
}
- char u1 = Character.toUpperCase(c1);
- char u2 = Character.toUpperCase(c2);
+ int u1 = CharacterDataLatin1.instance.toUpperCase(c1);
+ int u2 = CharacterDataLatin1.instance.toUpperCase(c2);
if (u1 == u2) {
continue;
}
@@ -413,7 +413,7 @@
if (c1 == c2) {
continue;
}
- char u1 = Character.toUpperCase(c1);
+ char u1 = (char) CharacterDataLatin1.instance.toUpperCase(c1);
char u2 = Character.toUpperCase(c2);
if (u1 == u2) {
continue;
@@ -435,7 +435,7 @@
// Now check if there are any characters that need to be changed, or are surrogate
for (first = 0 ; first < len; first++) {
int cp = value[first] & 0xff;
- if (cp != Character.toLowerCase(cp)) { // no need to check Character.ERROR
+ if (cp != CharacterDataLatin1.instance.toLowerCase(cp)) { // no need to check Character.ERROR
break;
}
}
@@ -450,7 +450,7 @@
// lowerCase characters.
for (int i = first; i < len; i++) {
int cp = value[i] & 0xff;
- cp = Character.toLowerCase(cp);
+ cp = CharacterDataLatin1.instance.toLowerCase(cp);
if (!canEncode(cp)) { // not a latin1 character
return toLowerCaseEx(str, value, first, locale, false);
}
@@ -474,7 +474,7 @@
if (localeDependent) {
lowerChar = ConditionalSpecialCasing.toLowerCaseEx(str, i, locale);
} else {
- lowerChar = Character.toLowerCase(srcChar);
+ lowerChar = CharacterDataLatin1.instance.toLowerCase(srcChar);
}
if (Character.isBmpCodePoint(lowerChar)) { // Character.ERROR is not a bmp
StringUTF16.putChar(result, resultOffset++, lowerChar);
@@ -509,7 +509,7 @@
// Now check if there are any characters that need to be changed, or are surrogate
for (first = 0 ; first < len; first++ ) {
int cp = value[first] & 0xff;
- if (cp != Character.toUpperCaseEx(cp)) { // no need to check Character.ERROR
+ if (cp != CharacterDataLatin1.instance.toUpperCaseEx(cp)) { // no need to check Character.ERROR
break;
}
}
@@ -525,7 +525,7 @@
// upperCase characters.
for (int i = first; i < len; i++) {
int cp = value[i] & 0xff;
- cp = Character.toUpperCaseEx(cp);
+ cp = CharacterDataLatin1.instance.toUpperCaseEx(cp);
if (!canEncode(cp)) { // not a latin1 character
return toUpperCaseEx(str, value, first, locale, false);
}
@@ -549,7 +549,7 @@
if (localeDependent) {
upperChar = ConditionalSpecialCasing.toUpperCaseEx(str, i, locale);
} else {
- upperChar = Character.toUpperCaseEx(srcChar);
+ upperChar = CharacterDataLatin1.instance.toUpperCaseEx(srcChar);
}
if (Character.isBmpCodePoint(upperChar)) {
StringUTF16.putChar(result, resultOffset++, upperChar);
@@ -559,7 +559,7 @@
upperCharArray =
ConditionalSpecialCasing.toUpperCaseCharArray(str, i, locale);
} else {
- upperCharArray = Character.toUpperCaseCharArray(srcChar);
+ upperCharArray = CharacterDataLatin1.instance.toUpperCaseCharArray(srcChar);
}
} else {
upperCharArray = Character.toChars(upperChar);
@@ -597,7 +597,7 @@
int left = 0;
while (left < length) {
char ch = getChar(value, left);
- if (ch != ' ' && ch != '\t' && !Character.isWhitespace(ch)) {
+ if (ch != ' ' && ch != '\t' && !CharacterDataLatin1.instance.isWhitespace(ch)) {
break;
}
left++;
@@ -610,7 +610,7 @@
int right = length;
while (0 < right) {
char ch = getChar(value, right - 1);
- if (ch != ' ' && ch != '\t' && !Character.isWhitespace(ch)) {
+ if (ch != ' ' && ch != '\t' && !CharacterDataLatin1.instance.isWhitespace(ch)) {
break;
}
right--;
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties Sat Aug 10 07:33:52 2019 -0400
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties Sat Aug 10 10:02:54 2019 -0400
@@ -30,17 +30,17 @@
java.launcher.opt.hotspot =\ {0}\t \u306F"{1}" VM\u306E\u30B7\u30CE\u30CB\u30E0\u3067\u3059 [\u975E\u63A8\u5968]\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer = \ -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n -p <module path>\n --module-path <module path>...\n \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n --upgrade-module-path <module path>...\n \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n --add-modules <module name>[,<module name>...]\n \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n ALL-MODULE-PATH.\n --list-modules\n \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n -d <module name>\n --describe-module <module name>\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n --dry-run VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n --validate-modules\n \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n -D<name>=<value>\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -verbose:[class|module|gc|jni]\n \u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n --version \
+java.launcher.opt.footer = \ -cp <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n -classpath <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n --class-path <\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB\u306E\u30AF\u30E9\u30B9\u691C\u7D22\u30D1\u30B9>\n {0}\u533A\u5207\u308A\u30EA\u30B9\u30C8(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u3001\n ZIP\u30A2\u30FC\u30AB\u30A4\u30D6)\u3067\u3001\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u7D22\u7528\u3002\n -p <module path>\n --module-path <module path>...\n \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n \u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\u3002\n --upgrade-module-path <module path>...\n \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E{0}\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3001\u5404\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n \u306F\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30A4\u30E1\u30FC\u30B8\u5185\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7F6E\u63DB\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u3059\n --add-modules <module name>[,<module name>...]\n \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n <module name>\u306B\u306F\u6B21\u3082\u6307\u5B9A\u3067\u304D\u307E\u3059: ALL-DEFAULT\u3001ALL-SYSTEM\u3001\n ALL-MODULE-PATH.\n --list-modules\n \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EA\u30B9\u30C8\u3057\u7D42\u4E86\u3057\u307E\u3059\n -d <module name>\n --describe-module <module name>\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8AAC\u660E\u3057\u7D42\u4E86\u3057\u307E\u3059\n --dry-run VM\u3092\u4F5C\u6210\u3057\u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u304C\u3001\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u5B9F\u884C\u3057\u307E\u305B\u3093\u3002\n --dry-run\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u8A3C\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u69CB\u6210\u306A\u3069\u306E\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3002\n --validate-modules\n \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u691C\u8A3C\u3057\u7D42\u4E86\u3057\u307E\u3059\n --validate-modules\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u691C\u7D22\u306B\u5F79\u7ACB\u3064\u5834\u5408\u304C\u3042\u308A\u307E\u3059:\n \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u4E0A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306E\u7AF6\u5408\u304A\u3088\u3073\u305D\u306E\u4ED6\u306E\u30A8\u30E9\u30FC\u3002\n -D<name>=<value>\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -verbose:[class|module|gc|jni]\n \u7279\u5B9A\u306E\u30B5\u30D6\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B\n -version \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n --version \
\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\n -showversion \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n --show-version\n \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n --show-module-resolution\n \u8D77\u52D5\u6642\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u89E3\u6C7A\u51FA\u529B\u3092\u8868\u793A\u3057\u307E\u3059\n -? -h -help\n \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n --help \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n -X \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u30A8\u30E9\u30FC\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n --help-extra \u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u51FA\u529B\u3057\u307E\u3059\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n -esa | -enablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n -dsa | -disablesystemassertions\n \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n -agentlib:<libname>[=<options>]\n \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002\u4F8B: -agentlib:jdwp\n -agentlib:jdwp=help\u3082\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n -agentpath:<pathname>[=<options>]\n \u30D5\u30EB\u30D1\u30B9\u540D\u3092\u4F7F\u7528\u3057\u3066\u3001\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\n -javaagent:<jarpath>[=<options>]\n Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002java.lang.instrument\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n -splash:<imagepath>\n \u6307\u5B9A\u3055\u308C\u305F\u30A4\u30E1\u30FC\u30B8\u3092\u542B\u3080\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3057\u307E\u3059\n HiDPI\u30B9\u30B1\u30FC\u30EB\u306E\u30A4\u30E1\u30FC\u30B8\u304C\u81EA\u52D5\u7684\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u4F7F\u7528\u3055\u308C\u307E\u3059\n (\u53EF\u80FD\u306A\u5834\u5408)\u3002\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u3055\u308C\u306A\u3044\u30A4\u30E1\u30FC\u30B8\u306E\u30D5\u30A1\u30A4\u30EB\u540D(image.ext\u306A\u3069)\u3092\n \u5F15\u6570\u3068\u3057\u3066-splash\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5FC5\u305A\u6E21\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n \
\u6307\u5B9A\u3055\u308C\u305F\u6700\u3082\u9069\u5207\u306A\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u6E08\u30A4\u30E1\u30FC\u30B8\u304C\u9078\u629E\u3055\u308C\u307E\u3059\n (\u81EA\u52D5\u7684)\u3002\n \u8A73\u7D30\u306F\u3001SplashScreen API\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n @argument\u30D5\u30A1\u30A4\u30EB\n \u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u542B\u30801\u3064\u4EE5\u4E0A\u306E\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\n -disable-@files\n \u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n --enable-preview\n \u30AF\u30E9\u30B9\u3092\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u6A5F\u80FD\u306B\u4F9D\u5B58\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\n\u9577\u3044\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u3001--<name>=<value>\u307E\u305F\u306F\n--<name> <value>\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n -Xcomp \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n -Xdebug \u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xinternalversion\n -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n \u8868\u793A\u3057\u307E\u3059\n -Xlog:<opts> Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xmn<size> \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:all\n \
- \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:locale\n \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:properties\n \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:vm\n \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:system\n (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -Xss<size> java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xverify \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n --add-reads <module>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n --illegal-access=<value>\n \u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30B3\u30FC\u30C9\u306B\u3088\u308B\u3001\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30BF\u30A4\u30D7\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u4E0D\u6B63\u30A2\u30AF\u30BB\u30B9\u3092\n \u8A31\u53EF\u307E\u305F\u306F\u62D2\u5426\u3057\u307E\u3059\u3002\n <value>\u306F"deny"\u3001"permit"\u3001"warn"\u307E\u305F\u306F"debug"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\n \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n --limit-modules <module name>[,<module name>...]\n \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n --patch-module <module>=<file>({0}<file>)*\n \
-JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n --disable-@files\u306F\u3001\u3055\u3089\u306A\u308B\u5F15\u6570\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n --source <version>\n \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
+java.launcher.X.usage=\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30FB\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3057\u307E\u3059\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059\n -Xcomp \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3057\u307E\u3059\n -Xdebug \u4F55\u3082\u884C\u3044\u307E\u305B\u3093\u3002\u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xinternalversion\n -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n \u8868\u793A\u3057\u307E\u3059\n -Xlog:<opts> Java Virtual Machine (JVM)\u7D71\u5408\u30ED\u30AE\u30F3\u30B0\u30FB\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3067\u306E\n \u30ED\u30AE\u30F3\u30B0\u3092\u69CB\u6210\u307E\u305F\u306F\u6709\u52B9\u5316\u3057\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-Xlog:help\u3092\n \u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3057\u307E\u3059\n \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u63A8\u5968\u3067\u3042\u308A\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\n \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002-Xlog:gc:<file>\u3067\u7F6E\u63DB\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xmn<size> \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u30B5\u30A4\u30BA\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA\n (\u30D0\u30A4\u30C8\u5358\u4F4D)\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3057\u307E\u3059(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:off \
+\u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u8A66\u307F\u307E\u305B\u3093\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3057\u307E\u3059\u3002\n \u3053\u308C\u306F\u30C6\u30B9\u30C8\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u65AD\u7D9A\u7684\u306A\u5931\u6557\u306B\u3064\u306A\u304C\u308B\n \u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u672C\u756A\u74B0\u5883\u3067\u306F\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:all\n \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:locale\n \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:properties\n \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:vm\n \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -XshowSettings:system\n (Linux\u306E\u307F)\u30DB\u30B9\u30C8\u30FB\u30B7\u30B9\u30C6\u30E0\u307E\u305F\u306F\u30B3\u30F3\u30C6\u30CA\u3092\u8868\u793A\u3057\u307E\u3059\n \u69CB\u6210\u3057\u3066\u7D9A\u884C\u3057\u307E\u3059\n -Xss<size> java\u30B9\u30EC\u30C3\u30C9\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n -Xverify \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u30FB\u30D9\u30EA\u30D5\u30A1\u30A4\u30A2\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n \u30AA\u30D7\u30B7\u30E7\u30F3-Xverify:none\u306F\u975E\u63A8\u5968\u306B\u306A\u308A\u3001\n \u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n --add-reads <module>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\u3092\n \u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n \u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092\n <target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n --illegal-access=<value>\n \
+\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30B3\u30FC\u30C9\u306B\u3088\u308B\u3001\u540D\u524D\u306E\u3042\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30BF\u30A4\u30D7\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u4E0D\u6B63\u30A2\u30AF\u30BB\u30B9\u3092\n \u8A31\u53EF\u307E\u305F\u306F\u62D2\u5426\u3057\u307E\u3059\u3002\n <value>\u306F"deny"\u3001"permit"\u3001"warn"\u307E\u305F\u306F"debug"\u306E\u3044\u305A\u308C\u304B\u3067\u3059\n \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u5C06\u6765\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n --limit-modules <module name>[,<module name>...]\n \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n --patch-module <module>=<file>({0}<file>)*\n JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\u3002\n --source <version>\n \u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30FB\u30E2\u30FC\u30C9\u3067\u30BD\u30FC\u30B9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\u3053\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FMac OS X\u56FA\u6709\u3067\u3059:\n -XstartOnFirstThread\n main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n -Xdock:name=<application name>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n -Xdock:icon=<path to icon file>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
+java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FmacOS\u56FA\u6709\u3067\u3059:\n -XstartOnFirstThread\n main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n -Xdock:name=<application name>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n -Xdock:icon=<path to icon file>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
java.launcher.cls.error1=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u3092\u691C\u51FA\u304A\u3088\u3073\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\n\u539F\u56E0: {1}: {2}
java.launcher.cls.error2=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{1}\u306E{0}\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n public static void main(String[] args)
--- a/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties Sat Aug 10 07:33:52 2019 -0400
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties Sat Aug 10 10:02:54 2019 -0400
@@ -30,15 +30,15 @@
java.launcher.opt.hotspot =\ {0}\t \u662F "{1}" VM \u7684\u540C\u4E49\u8BCD [\u5DF2\u8FC7\u65F6]\n
# Translators please note do not translate the options themselves
-java.launcher.opt.footer = \ -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n -p <\u6A21\u5757\u8DEF\u5F84>\n --module-path <\u6A21\u5757\u8DEF\u5F84>...\n \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n ALL-MODULE-PATH.\n --list-modules\n \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n -d <module name>\n --describe-module <\u6A21\u5757\u540D\u79F0>\n \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n --dry-run \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n --validate-modules\n \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n -D<\u540D\u79F0>=<\u503C>\n \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n -verbose:[class|module|gc|jni]\n \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n -version \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n --version \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n -showversion \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n --show-version\n \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n --show-module-resolution\n \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n -? -h -help\n \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n --help \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n -X \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n --help-extra \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n -esa \
-| -enablesystemassertions\n \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n -dsa | -disablesystemassertions\n \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n -splash:<\u56FE\u50CF\u8DEF\u5F84>\n \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n \u56FE\u50CF\u3002\n \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n @argument \u6587\u4EF6\n \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n -disable-@files\n \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n --enable-preview\n \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
+java.launcher.opt.footer = \ -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n --class-path <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n \u4F7F\u7528 {0} \u5206\u9694\u7684, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u7684\u76EE\u5F55, JAR \u6863\u6848\n \u548C ZIP \u6863\u6848\u5217\u8868\u3002\n -p <\u6A21\u5757\u8DEF\u5F84>\n --module-path <\u6A21\u5757\u8DEF\u5F84>...\n \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55\u3002\n --upgrade-module-path <\u6A21\u5757\u8DEF\u5F84>...\n \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u5217\u8868, \u6BCF\u4E2A\u76EE\u5F55\n \u90FD\u662F\u4E00\u4E2A\u5305\u542B\u6A21\u5757\u7684\u76EE\u5F55, \u8FD9\u4E9B\u6A21\u5757\n \u7528\u4E8E\u66FF\u6362\u8FD0\u884C\u65F6\u6620\u50CF\u4E2D\u7684\u53EF\u5347\u7EA7\u6A21\u5757\n --add-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757\u3002\n <\u6A21\u5757\u540D\u79F0> \u8FD8\u53EF\u4EE5\u4E3A ALL-DEFAULT, ALL-SYSTEM,\n ALL-MODULE-PATH.\n --list-modules\n \u5217\u51FA\u53EF\u89C2\u5BDF\u6A21\u5757\u5E76\u9000\u51FA\n -d <module name>\n --describe-module <\u6A21\u5757\u540D\u79F0>\n \u63CF\u8FF0\u6A21\u5757\u5E76\u9000\u51FA\n --dry-run \u521B\u5EFA VM \u5E76\u52A0\u8F7D\u4E3B\u7C7B, \u4F46\u4E0D\u6267\u884C main \u65B9\u6CD5\u3002\n \u6B64 --dry-run \u9009\u9879\u5BF9\u4E8E\u9A8C\u8BC1\u8BF8\u5982\n \u6A21\u5757\u7CFB\u7EDF\u914D\u7F6E\u8FD9\u6837\u7684\u547D\u4EE4\u884C\u9009\u9879\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n --validate-modules\n \u9A8C\u8BC1\u6240\u6709\u6A21\u5757\u5E76\u9000\u51FA\n --validate-modules \u9009\u9879\u5BF9\u4E8E\u67E5\u627E\n \u6A21\u5757\u8DEF\u5F84\u4E2D\u6A21\u5757\u7684\u51B2\u7A81\u53CA\u5176\u4ED6\u9519\u8BEF\u53EF\u80FD\u975E\u5E38\u6709\u7528\u3002\n -D<\u540D\u79F0>=<\u503C>\n \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n -verbose:[class|module|gc|jni]\n \u4E3A\u7ED9\u5B9A\u5B50\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n -version \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u9000\u51FA\n --version \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u9000\u51FA\n -showversion \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\u5E76\u7EE7\u7EED\n --show-version\n \u5C06\u4EA7\u54C1\u7248\u672C\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\u5E76\u7EE7\u7EED\n --show-module-resolution\n \u5728\u542F\u52A8\u8FC7\u7A0B\u4E2D\u663E\u793A\u6A21\u5757\u89E3\u6790\u8F93\u51FA\n -? -h -help\n \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n --help \u5C06\u6B64\u5E2E\u52A9\u6D88\u606F\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n -X \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u9519\u8BEF\u6D41\n --help-extra \u5C06\u989D\u5916\u9009\u9879\u7684\u5E2E\u52A9\u8F93\u51FA\u5230\u8F93\u51FA\u6D41\n -ea[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n -enableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n -da[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n -disableassertions[:<\u7A0B\u5E8F\u5305\u540D\u79F0>...|:<\u7C7B\u540D>]\n \
+\u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u7981\u7528\u65AD\u8A00\n -esa | -enablesystemassertions\n \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n -dsa | -disablesystemassertions\n \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n -agentlib:<\u5E93\u540D>[=<\u9009\u9879>]\n \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <\u5E93\u540D>, \u4F8B\u5982 -agentlib:jdwp\n \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help\n -agentpath:<\u8DEF\u5F84\u540D>[=<\u9009\u9879>]\n \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n -javaagent:<jar \u8DEF\u5F84>[=<\u9009\u9879>]\n \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n -splash:<\u56FE\u50CF\u8DEF\u5F84>\n \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n \u81EA\u52A8\u652F\u6301\u548C\u4F7F\u7528 HiDPI \u7F29\u653E\u56FE\u50CF\n (\u5982\u679C\u53EF\u7528)\u3002\u5E94\u59CB\u7EC8\u5C06\u672A\u7F29\u653E\u7684\u56FE\u50CF\u6587\u4EF6\u540D (\u4F8B\u5982, image.ext)\n \u4F5C\u4E3A\u53C2\u6570\u4F20\u9012\u7ED9 -splash \u9009\u9879\u3002\n \u5C06\u81EA\u52A8\u9009\u53D6\u63D0\u4F9B\u7684\u6700\u5408\u9002\u7684\u7F29\u653E\n \u56FE\u50CF\u3002\n \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 SplashScreen API \u6587\u6863\n @argument \u6587\u4EF6\n \u4E00\u4E2A\u6216\u591A\u4E2A\u5305\u542B\u9009\u9879\u7684\u53C2\u6570\u6587\u4EF6\n -disable-@files\n \u963B\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n --enable-preview\n \u5141\u8BB8\u7C7B\u4F9D\u8D56\u4E8E\u6B64\u53D1\u884C\u7248\u7684\u9884\u89C8\u529F\u80FD\n\u8981\u4E3A\u957F\u9009\u9879\u6307\u5B9A\u53C2\u6570, \u53EF\u4EE5\u4F7F\u7528 --<\u540D\u79F0>=<\u503C> \u6216\n--<\u540D\u79F0> <\u503C>\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n -Xcheck:jni \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n -Xcomp \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n -Xdebug \u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\n -Xdiag \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n -Xfuture \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\n \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n -Xint \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n -Xinternalversion\n \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n JVM \u7248\u672C\u4FE1\u606F\n -Xlog:<opts> \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n -Xloggc:<file> \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\n -Xmixed \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n -Xmn<size> \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n -Xms<size> \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n -Xmx<size> \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n -Xnoclassgc \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n -Xrs \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n -Xshare:auto \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n -Xshare:off \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n -Xshare:on \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n -XshowSettings \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:all\n \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:locale\n \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:properties\n \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:vm\n \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:system\n \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n \u914D\u7F6E\u5E76\u7EE7\u7EED\n -Xss<size> \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n -Xverify \u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n --add-reads <module>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n <target-module> \u53EF\u4EE5\u662F \
-ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n \u6A21\u5757\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n \u672A\u547D\u540D\u6A21\u5757\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n --illegal-access=<value>\n \u5141\u8BB8\u6216\u62D2\u7EDD\u901A\u8FC7\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u4EE3\u7801\u5BF9\u547D\u540D\u6A21\u5757\u4E2D\u7684\n \u7C7B\u578B\u6210\u5458\u8FDB\u884C\u8BBF\u95EE\u3002\n <value> \u4E3A "deny"\u3001"permit"\u3001"warn" \u6216 "debug" \u4E4B\u4E00\n \u6B64\u9009\u9879\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n --limit-modules <module name>[,<module name>...]\n \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n --patch-module <module>=<file>({0}<file>)*\n \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n --disable-@files \u7981\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n --source <version>\n \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+java.launcher.X.usage=\n -Xbatch \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n -Xcheck:jni \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n -Xcomp \u5F3A\u5236\u5728\u9996\u6B21\u8C03\u7528\u65F6\u7F16\u8BD1\u65B9\u6CD5\n -Xdebug \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C\u3002\u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\u3002\n -Xdiag \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n -Xfuture \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5\uFF0C\u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\u3002\n \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n \u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n -Xint \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n -Xinternalversion\n \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684\n JVM \u7248\u672C\u4FE1\u606F\n -Xlog:<opts> \u914D\u7F6E\u6216\u542F\u7528\u91C7\u7528 Java \u865A\u62DF\n \u673A (Java Virtual Machine, JVM) \u7EDF\u4E00\u8BB0\u5F55\u6846\u67B6\u8FDB\u884C\u4E8B\u4EF6\u8BB0\u5F55\u3002\u4F7F\u7528 -Xlog:help\n \u53EF\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002\n -Xloggc:<file> \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D\uFF08\u5E26\u65F6\u95F4\u6233\uFF09\u3002\n \u6B64\u9009\u9879\u5DF2\u8FC7\u65F6\uFF0C\u53EF\u80FD\u4F1A\u5728\n \u5C06\u6765\u7684\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\u5B83\u5C06\u66FF\u6362\u4E3A -Xlog:gc:<file>\u3002\n -Xmixed \u6DF7\u5408\u6A21\u5F0F\u6267\u884C\uFF08\u9ED8\u8BA4\u503C\uFF09\n -Xmn<size> \u4E3A\u5E74\u8F7B\u4EE3\uFF08\u65B0\u751F\u4EE3\uFF09\u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n \uFF08\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D\uFF09\n -Xms<size> \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n -Xmx<size> \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n -Xnoclassgc \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n -Xrs \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528\uFF08\u8BF7\u53C2\u89C1\u6587\u6863\uFF09\n -Xshare:auto \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF08\u9ED8\u8BA4\u503C\uFF09\n -Xshare:off \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n -Xshare:on \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\uFF0C\u5426\u5219\u5C06\u5931\u8D25\u3002\n \u8FD9\u662F\u4E00\u4E2A\u6D4B\u8BD5\u9009\u9879\uFF0C\u53EF\u80FD\u5BFC\u81F4\u95F4\u6B47\u6027\n \u6545\u969C\u3002\u4E0D\u5E94\u5728\u751F\u4EA7\u73AF\u5883\u4E2D\u4F7F\u7528\u5B83\u3002\n -XshowSettings \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:all\n \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:locale\n \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:properties\n \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:vm\n \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:system\n \uFF08\u4EC5 Linux\uFF09\u663E\u793A\u4E3B\u673A\u7CFB\u7EDF\u6216\u5BB9\u5668\n \u914D\u7F6E\u5E76\u7EE7\u7EED\n -Xss<size> \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n -Xverify \
+\u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n \u8BF7\u6CE8\u610F\uFF0C\u9009\u9879 -Xverify:none \u5DF2\u8FC7\u65F6\uFF0C\n \u53EF\u80FD\u4F1A\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n --add-reads <module>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u8BFB\u53D6 <target-module>\uFF0C\u800C\u65E0\u8BBA\n \u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002 \n <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n \u6A21\u5757\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u5C06 <package> \u5BFC\u51FA\u5230 <target-module>\uFF0C\n \u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n <target-module> \u53EF\u4EE5\u662F ALL-UNNAMED\uFF0C\u5C06\u5BFC\u51FA\u5230\u6240\u6709\n \u672A\u547D\u540D\u6A21\u5757\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u5728 <target-module> \u4E2D\u6253\u5F00\n <package>\uFF0C\u800C\u65E0\u8BBA\u6A21\u5757\u5982\u4F55\u58F0\u660E\u3002\n --illegal-access=<value>\n \u5141\u8BB8\u6216\u62D2\u7EDD\u901A\u8FC7\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u4EE3\u7801\u5BF9\u547D\u540D\u6A21\u5757\u4E2D\u7684\n \u7C7B\u578B\u6210\u5458\u8FDB\u884C\u8BBF\u95EE\u3002\n <value> \u4E3A "deny"\u3001"permit"\u3001"warn" \u6216 "debug" \u4E4B\u4E00\n \u6B64\u9009\u9879\u5C06\u5728\u672A\u6765\u53D1\u884C\u7248\u4E2D\u5220\u9664\u3002\n --limit-modules <module name>[,<module name>...]\n \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n --patch-module <module>=<file>({0}<file>)*\n \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n --source <version>\n \u8BBE\u7F6E\u6E90\u6587\u4EF6\u6A21\u5F0F\u4E2D\u6E90\u7684\u7248\u672C\u3002\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
# Translators please note do not translate the options themselves
-java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u4E3A Mac OS X \u7279\u5B9A\u7684\u9009\u9879:\n -XstartOnFirstThread\n \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n -Xdock:name=<\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0>\n \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n -Xdock:icon=<\u56FE\u6807\u6587\u4EF6\u7684\u8DEF\u5F84>\n \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
+java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u662F\u7279\u5B9A\u4E8E macOS \u7684\u9009\u9879\uFF1A\n -XstartOnFirstThread\n \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n -Xdock:name=<application name>\n \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n -Xdock:icon=<path to icon file>\n \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
java.launcher.cls.error1=\u9519\u8BEF: \u627E\u4E0D\u5230\u6216\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u7C7B {0}\n\u539F\u56E0: {1}: {2}
java.launcher.cls.error2=\u9519\u8BEF: main \u65B9\u6CD5\u4E0D\u662F\u7C7B {1} \u4E2D\u7684{0}, \u8BF7\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n public static void main(String[] args)
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java Sat Aug 10 07:33:52 2019 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java Sat Aug 10 10:02:54 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -49,7 +49,7 @@
/**
* Returns the expression for the case, or
* {@code null} if this is the default case.
- * If this case has multiple lables, returns the first label.
+ * If this case has multiple labels, returns the first label.
* @return the expression for the case, or null
*/
ExpressionTree getExpression();
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Sat Aug 10 07:33:52 2019 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Sat Aug 10 10:02:54 2019 -0400
@@ -179,6 +179,8 @@
compiler.err.switch.expression.empty=switch\u5F0F\u306Bcase\u53E5\u304C\u3042\u308A\u307E\u305B\u3093
+compiler.err.switch.expression.no.result.expressions=switch\u5F0F\u306B\u7D50\u679C\u5F0F\u304C\u3042\u308A\u307E\u305B\u3093
+
# 0: name
compiler.err.call.must.be.first.stmt.in.ctor={0}\u306E\u547C\u51FA\u3057\u306F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5148\u982D\u6587\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Sat Aug 10 07:33:52 2019 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties Sat Aug 10 10:02:54 2019 -0400
@@ -179,6 +179,8 @@
compiler.err.switch.expression.empty=switch \u8868\u8FBE\u5F0F\u4E2D\u6CA1\u6709\u4EFB\u4F55 case \u5B50\u53E5
+compiler.err.switch.expression.no.result.expressions=switch \u8868\u8FBE\u5F0F\u6CA1\u6709\u4EFB\u4F55\u7ED3\u679C\u8868\u8FBE\u5F0F
+
# 0: name
compiler.err.call.must.be.first.stmt.in.ctor=\u5BF9{0}\u7684\u8C03\u7528\u5FC5\u987B\u662F\u6784\u9020\u5668\u4E2D\u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java Sat Aug 10 07:33:52 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,10 @@
package jdk.javadoc.doclet;
import java.util.Locale;
+import java.util.List;
import java.util.Set;
+import javax.lang.model.element.Element;
import javax.lang.model.SourceVersion;
import jdk.javadoc.internal.doclets.formats.html.HtmlDoclet;
@@ -36,6 +38,31 @@
* This doclet generates HTML-formatted documentation for the specified modules,
* packages and types.
*
+ * <h2><a id="user-defined-taglets">User-Defined Taglets</a></h2>
+ *
+ * The standard doclet supports user-defined {@link Taglet taglets},
+ * which can be used to generate customized output for user-defined tags
+ * in documentation comments.
+ *
+ * Taglets invoked by the standard doclet must return strings from
+ * {@link Taglet#toString(List,Element) Taglet.toString} as follows:
+ *
+ * <dl>
+ * <dt> <i>Inline Tags</i>
+ * <dd> The returned string must be
+ * <a href="https://www.w3.org/TR/html52/dom.html#flow-content">flow content</a>,
+ * or any valid fragment of HTML code that may appear in the body of a document.
+ * There may be additional constraints, depending on how the tag is to be
+ * used in a documentation comment: for example, if the tag may be used
+ * within an inline element such as {@code <b>} or {@code <i>}, the taglet
+ * must not return a string containing block tags, like {@code <h3>} or
+ * {@code <p>}.
+ * <dt> <i>Block Tags</i>
+ * <dd> The returned string must be suitable content for a definition list,
+ * or {@code <dl>} element. It will typically be a series of pairs
+ * of {@code <dt>} and {@code <dd>} elements.
+ * </dl>
+ *
* @see <a href="{@docRoot}/../specs/javadoc/doc-comment-spec.html">
* Documentation Comment Specification for the Standard Doclet</a>
*/
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java Sat Aug 10 07:33:52 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java Sat Aug 10 10:02:54 2019 -0400
@@ -36,13 +36,42 @@
* The interface for a custom taglet supported by doclets such as
* the {@link jdk.javadoc.doclet.StandardDoclet standard doclet}.
* Custom taglets are used to handle custom tags in documentation
- * comments.
+ * comments; custom tags can be either <i>block tags</i>, which
+ * appear at the end of a comment, or <i>inline tags</i>, which
+ * can appear within the main body of a documentation comment.
+ *
+ * <p> Each implementation of a taglet must provide a public no-argument constructor
+ * to be used by doclets to instantiate the taglet. A doclet will interact
+ * with classes implementing this interface as follows:
*
- * <p>A custom taglet must implement this interface, and must have
- * a public default constructor (i.e. a public constructor with no
- * parameters), by which, the doclet will instantiate and
- * register the custom taglet.
+ * <ol>
+ * <li> The doclet will create an instance of a taglet using the no-arg
+ * constructor of the taglet class.
+ * <li> Next, the doclet calls the {@link #init(DocletEnvironment,Doclet) init}
+ method with an appropriate environment and doclet.
+ * <li> Afterwards, the doclet calls {@link #getName() getName},
+ * {@link #getAllowedLocations() getAllowedLocations}, and
+ * {@link #isInlineTag() isInlineTag}, to determine the characteristics
+ * of the tags supported by the taglet.
+ * <li> As appropriate, the doclet calls the
+ * {@link #toString(List,Element) toString} method on the taglet object,
+ * giving it a list of tags and the element for which the tags are part
+ * of the element's documentation comment, from which the taglet can
+ * determine the string to be included in the documentation.
+ * The doclet will typically specify any requirements on the contents of
+ * the string that is returned.
+ * </ol>
*
+ * <p>If a taglet object is created and used without the above protocol being
+ * followed, then the taglet's behavior is not defined by this interface
+ * specification.
+ *
+ * @apiNote
+ * It is typical for a taglet to be designed to work in conjunction with a
+ * specific doclet.
+ *
+ * @see <a href="StandardDoclet.html#user-defined-taglets">User-Defined Taglets
+ * for the Standard Doclet</a>
* @since 9
*/
@@ -85,14 +114,19 @@
/**
* Returns the string representation of a series of instances of
* this tag to be included in the generated output.
- * If this taglet is for an {@link #isInlineTag inline} tag it will
+ *
+ * <p>If this taglet is for an {@link #isInlineTag inline} tag it will
* be called once per instance of the tag, each time with a singleton list.
* Otherwise, if this tag is a block tag, it will be called once per
* comment, with a list of all the instances of the tag in a comment.
+ *
* @param tags the list of instances of this tag
* @param element the element to which the enclosing comment belongs
* @return the string representation of the tags to be included in
* the generated output
+ *
+ * @see <a href="StandardDoclet.html#user-defined-taglets">User-Defined Taglets
+ * for the Standard Doclet</a>
*/
String toString(List<? extends DocTree> tags, Element element);
--- a/test/hotspot/jtreg/TEST.groups Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/TEST.groups Sat Aug 10 10:02:54 2019 -0400
@@ -53,6 +53,9 @@
hotspot_serviceability = \
serviceability
+hotspot_resourcehogs = \
+ resourcehogs
+
hotspot_misc = \
/ \
-applications \
@@ -368,8 +371,7 @@
serviceability/sa \
-serviceability/sa/ClhsdbScanOops.java \
-serviceability/sa/TestJmapCore.java \
- -serviceability/sa/TestJmapCoreMetaspace.java \
- -serviceability/sa/TestHeapDumpForLargeArray.java
+ -serviceability/sa/TestJmapCoreMetaspace.java
tier1 = \
:tier1_common \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/resourcehogs/TEST.properties Sat Aug 10 10:02:54 2019 -0400
@@ -0,0 +1,1 @@
+exclusiveAccess.dirs=.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/resourcehogs/serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java Sat Aug 10 10:02:54 2019 -0400
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2018, 2019, 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.
+ */
+
+/**
+ * @test
+ * @bug 8175312
+ * @summary Test clhsdb 'g1regiondetails' and 'scanoops' commands for G1GC
+ * @requires vm.hasSA & (vm.bits == "64" & os.maxMemory > 8g)
+ * @library /test/lib /test/hotspot/jtreg/serviceability/sa
+ * @run main/othervm/timeout=2400 ClhsdbRegionDetailsScanOopsForG1
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import jdk.test.lib.apps.LingeredApp;
+import jtreg.SkippedException;
+
+public class ClhsdbRegionDetailsScanOopsForG1 {
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting ClhsdbRegionDetailsScanOopsForG1 test");
+
+ LingeredAppWithLargeStringArray theApp = null;
+ try {
+ ClhsdbLauncher test = new ClhsdbLauncher();
+ List<String> vmArgs = new ArrayList<String>();
+ vmArgs.add("-XX:+UseG1GC");
+ vmArgs.add("-Xmx8g");
+ vmArgs.add("-XX:G1HeapRegionSize=2m");
+
+ theApp = new LingeredAppWithLargeStringArray();
+ LingeredApp.startApp(vmArgs, theApp);
+ System.out.println("Started LingeredAppWithLargeStringArray with pid " + theApp.getPid());
+
+ List<String> cmds = List.of("g1regiondetails");
+ Map<String, List<String>> expStrMap = new HashMap<>();
+ Map<String, List<String>> unExpStrMap = new HashMap<>();
+
+ // Test that the various types of regions are listed with the
+ // 'g1regiondetails' command
+ expStrMap.put("g1regiondetails", List.of(
+ "Region",
+ "Eden",
+ "Survivor",
+ "StartsHumongous",
+ "ContinuesHumongous",
+ "Free"));
+ unExpStrMap.put("g1regiondetails", List.of("Unknown Region Type"));
+ String regionDetailsOutput = test.run(theApp.getPid(), cmds,
+ expStrMap, unExpStrMap);
+ // Test the output of 'scanoops' -- get the start and end addresses
+ // from the StartsHumongous region. Ensure that it contains an
+ // array of Strings.
+ String[] snippets = regionDetailsOutput.split(":StartsHumongous");
+ snippets = snippets[0].split("Region: ");
+ String[] words = snippets[snippets.length - 1].split(",");
+ // words[0] and words[1] represent the start and end addresses
+ String cmd = "scanoops " + words[0] + " " + words[1];
+ expStrMap = new HashMap<>();
+ expStrMap.put(cmd, List.of("\\[Ljava/lang/String"));
+ test.run(theApp.getPid(), List.of(cmd), expStrMap, null);
+ } catch (SkippedException e) {
+ throw e;
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ System.out.println("Test PASSED");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/resourcehogs/serviceability/sa/LingeredAppWithLargeArray.java Sat Aug 10 10:02:54 2019 -0400
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+import jdk.test.lib.apps.LingeredApp;
+
+public class LingeredAppWithLargeArray extends LingeredApp {
+ public static void main(String args[]) {
+ int[] hugeArray = new int[Integer.MAX_VALUE/2];
+ LingeredApp.main(args);
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/resourcehogs/serviceability/sa/LingeredAppWithLargeStringArray.java Sat Aug 10 10:02:54 2019 -0400
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+import jdk.test.lib.apps.LingeredApp;
+
+public class LingeredAppWithLargeStringArray extends LingeredApp {
+ public static void main(String args[]) {
+ String[] hugeArray = new String[Integer.MAX_VALUE/8];
+ String[] smallArray = {"Just", "for", "testing"};
+ for (int i = 0; i < hugeArray.length/16; i++) {
+ hugeArray[i] = new String(smallArray[i%3]);
+ }
+ LingeredApp.main(args);
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java Sat Aug 10 10:02:54 2019 -0400
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2017, 2019, 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.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.io.File;
+import java.nio.file.Files;
+import java.io.IOException;
+import java.io.BufferedInputStream;
+import java.util.stream.Collectors;
+import java.io.FileInputStream;
+
+import sun.jvm.hotspot.HotSpotAgent;
+import sun.jvm.hotspot.debugger.*;
+
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Utils;
+import jdk.test.lib.Asserts;
+
+/**
+ * @test
+ * @library /test/lib
+ * @bug 8171084
+ * @requires vm.hasSAandCanAttach & (vm.bits == "64" & os.maxMemory > 8g)
+ * @modules java.base/jdk.internal.misc
+ * jdk.hotspot.agent/sun.jvm.hotspot
+ * jdk.hotspot.agent/sun.jvm.hotspot.utilities
+ * jdk.hotspot.agent/sun.jvm.hotspot.oops
+ * jdk.hotspot.agent/sun.jvm.hotspot.debugger
+ * @run main/timeout=1800/othervm -Xmx8g TestHeapDumpForLargeArray
+ */
+
+public class TestHeapDumpForLargeArray {
+
+ private static LingeredAppWithLargeArray theApp = null;
+
+ private static void attachAndDump(String heapDumpFileName,
+ long lingeredAppPid) throws Exception {
+
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
+ launcher.addToolArg("jmap");
+ launcher.addToolArg("--binaryheap");
+ launcher.addToolArg("--dumpfile");
+ launcher.addToolArg(heapDumpFileName);
+ launcher.addToolArg("--pid");
+ launcher.addToolArg(Long.toString(lingeredAppPid));
+
+ ProcessBuilder processBuilder = new ProcessBuilder();
+ processBuilder.command(launcher.getCommand());
+ System.out.println(
+ processBuilder.command().stream().collect(Collectors.joining(" ")));
+
+ OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder);
+ SAOutput.shouldHaveExitValue(0);
+ SAOutput.shouldNotContain("Heap segment size overflow");
+ SAOutput.shouldContain("truncating to");
+ SAOutput.shouldContain("heap written to");
+ SAOutput.shouldContain(heapDumpFileName);
+ System.out.println(SAOutput.getOutput());
+
+ }
+
+ public static void main (String... args) throws Exception {
+
+ String heapDumpFileName = "LargeArrayHeapDump.bin";
+
+ File heapDumpFile = new File(heapDumpFileName);
+ if (heapDumpFile.exists()) {
+ heapDumpFile.delete();
+ }
+
+ try {
+ // Need to add the default arguments first to have explicit
+ // -Xmx8g last, otherwise test will fail if default
+ // arguments contain a smaller -Xmx.
+ List<String> vmArgs = new ArrayList<String>();
+ vmArgs.addAll(Utils.getVmOptions());
+ vmArgs.add("-XX:+UsePerfData");
+ vmArgs.add("-Xmx8g");
+
+ theApp = new LingeredAppWithLargeArray();
+ LingeredApp.startApp(vmArgs, theApp);
+ attachAndDump(heapDumpFileName, theApp.getPid());
+ } finally {
+ LingeredApp.stopApp(theApp);
+ heapDumpFile.delete();
+ }
+ }
+}
--- a/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,8 +29,6 @@
* mode is AUTO.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver ArchiveDoesNotExist
*/
--- a/test/hotspot/jtreg/runtime/cds/BootAppendTests.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/BootAppendTests.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,10 +27,6 @@
* @summary Testing -Xbootclasspath/a support for CDS
* @requires vm.cds
* @library /test/lib
- * @modules java.compiler
- * java.base/jdk.internal.misc
- * java.management
- * jdk.internal.jvmstat/sun.jvmstat.monitor
* @compile javax/sound/sampled/MyClass.jasm
* @compile javax/annotation/processing/FilerException.jasm
* @compile nonjdk/myPackage/MyClass.java
--- a/test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java Sat Aug 10 10:02:54 2019 -0400
@@ -32,8 +32,6 @@
* @requires vm.bits == 64
* @library /test/lib
* @bug 8025642
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver CdsDifferentObjectAlignment
*/
--- a/test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,8 +28,6 @@
* @requires vm.cds
* @requires vm.bits == 64
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver CdsSameObjectAlignment
*/
--- a/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,6 @@
* @summary JDK platforms/binaries do not support default CDS archive should
* not contain classes.jsa in the default location.
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,8 +28,6 @@
* Verify a set of well-known shared classes.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,7 +27,6 @@
* @summary Check that Shared Dictionary is printed out with jcmd
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
* @run driver DumpSharedDictionary
*/
--- a/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,6 @@
* @bug 8059510
* @summary Test jcmd VM.symboltable, VM.stringtable and VM.systemdictionary options
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run main/othervm -XX:+UnlockDiagnosticVMOptions DumpSymbolAndStringTable
*/
import jdk.test.lib.cds.CDSTestUtils;
--- a/test/hotspot/jtreg/runtime/cds/NonBootLoaderClasses.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/NonBootLoaderClasses.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,6 @@
* @summary Test to ensure platform and app classes are archived when specified in classlist
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver NonBootLoaderClasses
*/
--- a/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,8 +27,6 @@
* VM handles normal values as well as edge values w/o a crash.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver SharedBaseAddress
*/
--- a/test/hotspot/jtreg/runtime/cds/SharedStrings.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/SharedStrings.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,8 +27,6 @@
* are actually shared
* @requires vm.cds.archived.java.heap
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @build SharedStringsWb sun.hotspot.WhiteBox
* @run driver ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
* @run driver SharedStrings
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,6 @@
* @summary Test -Xshare:auto with shared strings and -XX:+UseStringDeduplication
* @requires vm.cds.archived.java.heap
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver SharedStringsDedup
*/
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,6 @@
* @summary Test -Xshare:auto with shared strings.
* @requires vm.cds.archived.java.heap
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver SharedStringsRunAuto
*/
--- a/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,8 +26,6 @@
* @summary Check if the space utilization for shared spaces is adequate
* @requires vm.cds
* @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
--- a/test/hotspot/jtreg/runtime/cds/TestInterpreterMethodEntries.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/TestInterpreterMethodEntries.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,8 +30,6 @@
* @comment the test disables intrinsics, so it can't be run w/ AOT'ed java module
* @requires !vm.aot.enabled
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver TestInterpreterMethodEntries true false
*/
@@ -42,8 +40,6 @@
* and the intrinsic flag disabled during dump and enabled during use of the archive.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
* @run driver TestInterpreterMethodEntries false true
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary At run time, it is OK to append new elements to the classpath that was used at dump time.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @compile test-classes/HelloMore.java
* @run driver AppendClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary bootclasspath mismatch test.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver BootClassPathMismatch
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,7 +27,6 @@
* @summary Make sure CDS and JFR work together.
* @requires vm.hasJFR & vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes test-classes
- * @modules jdk.jfr
* @build Hello GetFlightRecorder
* @run driver ClassFileInstaller -jar CDSandJFR.jar Hello GetFlightRecorder GetFlightRecorder$TestEvent GetFlightRecorder$SimpleEvent
* @run main/othervm/timeout=500 CDSandJFR
--- a/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* between dump time and archive use time
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @requires os.family != "mac"
* @compile test-classes/Hello.java
* @run driver CaseSensitiveClassPath
--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Initiating and defining classloader test.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @compile test-classes/HelloWB.java
* @compile test-classes/ForNameTest.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Class-Path: attribute in MANIFEST file
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @run driver ClassPathAttr
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Sat Aug 10 10:02:54 2019 -0400
@@ -32,9 +32,7 @@
* @summary Test command line flag combinations that
* could likely affect the behaviour of AppCDS
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @compile test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,9 +30,7 @@
* execute w/o compressed oops
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver CommandLineFlagComboNegative
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,8 +28,7 @@
* --patch-module.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/ArrayListTest.java
* @run driver DumpClassList
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Adding extra symbols into CDS archive using -XX:SharedArchiveConfigFile
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver ExtraSymbols
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test for field annotations.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/FieldAnnotationsApp.java test-classes/MyAnnotation.java
* @run driver FieldAnnotationsTest
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,10 +28,7 @@
* (which used to be called the "extension loader) in AppCDS
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
- * jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/HelloExt.java
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Hello World test for AppCDS
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver HelloTest
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test the -XX:+IgnoreEmptyClassPaths flag
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @compile test-classes/HelloMore.java
* @run driver IgnoreEmptyClassPaths
--- a/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @requires vm.cds
* @bug 8060592
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @compile test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test the handling of long path to the classlist file.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver LongClassListPath
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
*
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/MissingSuper.java
* @run driver MissingSuperTest
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @requires vm.cds
* @requires os.family == "linux"
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver MoveJDKTest
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
*
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @compile test-classes/MultiProcClass.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,8 +27,7 @@
* @summary Test multi-release jar with AppCDS.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @run main/othervm/timeout=2400 MultiReleaseJars
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,8 +28,6 @@
* @requires vm.cds
* @library /test/lib
* @modules java.base/jdk.internal.org.objectweb.asm
- * java.base/jdk.internal.misc
- * java.management
* jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run build TestCommon JarBuilder
--- a/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Load app classes from CDS archive in parallel threads. Similar to ParallelLoad.java, but each class in its own JAR
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/ParallelLoad.java
* @compile test-classes/ParallelClasses.java
* @run driver ParallelLoad2
--- a/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Load app classes from CDS archive in parallel threads
* @library /test/lib
* @requires vm.cds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/ParallelLoad.java
* @compile test-classes/ParallelClasses.java
* @run driver ParallelLoadTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary test the -XX:+PrintSharedArchiveAndExit flag
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @compile test-classes/HelloMore.java
* @run main/othervm/timeout=3600 PrintSharedArchiveAndExit
--- a/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary AppCDS handling of protection domain.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/ProtDomain.java
* @compile test-classes/ProtDomainB.java
* @compile test-classes/JimageClassProtDomain.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test relative paths specified in the -cp.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @compile test-classes/HelloMore.java
* @run driver RelativePath
--- a/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* the archived class with the same name is not loaded.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/RewriteBytecodes.java test-classes/Util.java test-classes/Super.java test-classes/Child.java
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,11 +27,7 @@
* @summary SharedArchiveConsistency
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.compiler
- * java.management
- * jdk.jartool/sun.tools.jar
- * jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile test-classes/Hello.java
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* w/o a crash.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run main/timeout=240 SharedBaseAddress
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary AppCDS handling of package.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/PackageTest.java
* @compile test-classes/JimageClassPackage.java
* @run driver SharedPackages
--- a/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary AppCDS handling of signed JAR.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver SignedJar
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,8 +27,7 @@
* @summary If -Djava.system.class.loader=xxx is specified in command-line, disable archived non-system classes
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/TestClassLoader.java
* @compile test-classes/ReportMyLoader.java
* @compile test-classes/TrySwitchMyLoader.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java Sat Aug 10 10:02:54 2019 -0400
@@ -31,9 +31,7 @@
* profiler.
* @requires vm.hasJFR & vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/MyThread.java
* @compile test-classes/TestWithProfilerHelper.java
* @run driver TestWithProfiler
--- a/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary ensure -XX:+TraceClassPaths showing entire expecting app classpath
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @compile test-classes/Super.java
* @run driver TraceLongClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,7 +27,6 @@
* @summary Unverfiable app classes should not be archived.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
* @modules jdk.jartool/sun.tools.jar
* java.base/jdk.internal.org.objectweb.asm
* @compile test-classes/Greet.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,7 +27,6 @@
* @summary Unverfiable app classes should not be archived.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
* @modules jdk.jartool/sun.tools.jar
* java.base/jdk.internal.org.objectweb.asm
* @compile test-classes/Greet.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,7 +27,6 @@
* @summary Unverfiable app classes should not be archived.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
* @modules jdk.jartool/sun.tools.jar
* java.base/jdk.internal.org.objectweb.asm
* @compile test-classes/Greet.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,7 +27,6 @@
* @summary Unverfiable app classes should not be archived.
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
* @modules jdk.jartool/sun.tools.jar
* java.base/jdk.internal.org.objectweb.asm
* @compile test-classes/Greet.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test 'iload_w' bytecode in shared class
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Iloadw.jasm
* @compile test-classes/IloadwMain.java
* @run driver WideIloadTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary classpath mismatch between dump time and execution time
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver WrongClasspath
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test -Xshare:auto for AppCDS
* @requires vm.cds
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/Hello.java
* @run driver XShareAutoWithChangedJar
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary Test primitive box caches integrity in various scenarios (IntegerCache etc)
* @requires vm.cds.archived.java.heap
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile CheckIntegerCacheApp.java
* @run driver ClassFileInstaller -jar boxCache.jar CheckIntegerCacheApp
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary Test archived system module sub-graph and verify objects are archived.
* @requires vm.cds.archived.java.heap
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile CheckArchivedModuleApp.java
* @run driver ClassFileInstaller -jar app.jar CheckArchivedModuleApp
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary Compare archived system modules with non-archived.
* @requires vm.cds.archived.java.heap
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
* @compile PrintSystemModulesApp.java
* @run driver ClassFileInstaller -jar app.jar PrintSystemModulesApp
* @run driver ArchivedModuleCompareTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,10 +26,6 @@
* @summary Test archived module graph with custom runtime image
* @requires vm.cds.archived.java.heap
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.module
- * java.management
- * jdk.jlink
- * jdk.compiler
* @build sun.hotspot.WhiteBox
* @compile CheckArchivedModuleApp.java
* @run driver ClassFileInstaller -jar app.jar CheckArchivedModuleApp
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,6 @@
* @requires vm.cds.archived.java.heap
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile CheckCachedMirrorApp.java
* @compile ../test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,6 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile CheckCachedResolvedReferencesApp.java
* @compile ../test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @bug 8186789
* @requires vm.cds.archived.java.heap
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile MyOuter.java MyException.java
* @run driver DumpTimeVerifyFailure
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary
* @requires vm.cds.archived.java.heap
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile GCStressApp.java
* @run driver ClassFileInstaller -jar gcstress.jar GCStressApp
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary Test archived mirror with reference fields
* @requires vm.cds.archived.java.heap
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile MirrorWithReferenceFieldsApp.java
* @run driver ClassFileInstaller -jar app.jar MirrorWithReferenceFieldsApp
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java Sat Aug 10 10:02:54 2019 -0400
@@ -31,9 +31,7 @@
* vm options.
* @requires (vm.gc=="null")
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java
* @run driver OpenArchiveRegion
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary Test archived primitive type mirrors
* @requires vm.cds.archived.java.heap
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @compile PrimitiveTypesApp.java
* @run driver ClassFileInstaller -jar app.jar PrimitiveTypesApp FieldsTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,6 @@
* @summary Redefine shared class. GC should not cause crash with cached resolved_references.
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes /test/hotspot/jtreg/runtime/cds/appcds/jvmti
* @requires vm.cds.archived.java.heap
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
* @build sun.hotspot.WhiteBox
* RedefineClassApp
* InstrumentationClassFileTransformer
--- a/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -25,7 +25,6 @@
* @test
* @summary Make sure CDS works with a minimal test case that uses a CONSTANT_Dynamic constant-pool entry
* @requires (vm.cds)
- * @modules java.base/jdk.internal.misc
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @build CondyHello
* @build sun.hotspot.WhiteBox CondyHelloTest CondyHelloApp
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
* test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
* @run driver ClassListFormatA
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
* test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
* @run driver ClassListFormatB
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
* test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
* @run driver ClassListFormatC
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
* test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
* @run driver ClassListFormatD
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
* test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
* @run driver ClassListFormatE
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,8 +28,6 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /runtime/testlibrary
- * @modules java.base/jdk.internal.misc
- * java.management
* @compile test-classes/HelloUnload.java test-classes/CustomLoadee.java
* @build sun.hotspot.WhiteBox ClassUnloadCommon
* @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,9 +29,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/LoaderSegregation.java
* test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
* test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/ParallelLoad.java ../test-classes/ParallelClasses.java
* @run driver ParallelTestMultiFP
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/ParallelLoad.java ../test-classes/ParallelClasses.java
* @run driver ParallelTestSingleFP
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ClassListFormatBase.java ../test-classes/Hello.java test-classes/InProhibitedPkg.java
* @run driver ProhibitedPackageNamesTest
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,9 +30,7 @@
* @requires vm.cds.custom.loaders
*
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/ProtDomain.java
* @run driver ProtectionDomain
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,9 +30,7 @@
* @requires vm.cds.custom.loaders
*
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/CustomLoadee.java
* test-classes/CustomLoadee3.java
* test-classes/SameNameUnrelatedLoaders.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* @requires vm.cds
* @requires vm.cds.custom.loaders
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/UnintendedLoaders.java test-classes/CustomLoadee.java
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,9 +30,7 @@
* @requires vm.cds.custom.loaders
* @requires vm.opt.final.ClassUnloading
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/testlibrary
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox ClassUnloadCommon
* @compile test-classes/UnloadUnregisteredLoader.java test-classes/CustomLoadee.java
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Ensure that support for AppCDS custom class loaders are not enabled on unsupported platforms.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile test-classes/SimpleHello.java
* @run driver UnsupportedPlatforms
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary At run time, it is OK to append new elements to the classpath that was used at dump time.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java
* @compile ../test-classes/HelloMore.java
* @run driver AppendClasspath
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,8 +27,7 @@
* @summary The DynamicDumpShareSpaces flag is internal, setting it at the command line should have no effect.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java
* @run driver DynamicFlag
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java Sat Aug 10 10:02:54 2019 -0400
@@ -38,7 +38,6 @@
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes
* @build LoadClasses
* @build sun.hotspot.WhiteBox
- * @modules jdk.jartool/sun.tools.jar
* @run driver ClassFileInstaller -jar loadclasses.jar LoadClasses
* @run driver ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
* @run driver/timeout=500 DynamicLotsOfClasses
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,7 +28,6 @@
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes
* @build TestJIT
- * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
* @run driver ClassFileInstaller -jar testjit.jar TestJIT
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run driver MainModuleOnly
* @summary Test some scenarios with a main modular jar specified in the --module-path and -cp options in the command line.
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test relative paths specified in the -cp.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java
* @compile ../test-classes/HelloMore.java
* @run driver RelativePath
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java Sat Aug 10 10:02:54 2019 -0400
@@ -32,9 +32,6 @@
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @requires vm.cds
* @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
* @build AnonVmClassesDuringDumpTransformer Hello
* @run main/othervm AnonVmClassesDuringDump
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,6 @@
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @requires vm.cds
* @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
* @build GCDuringDumpTransformer Hello
* @run main/othervm GCDuringDump
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,7 @@
* option for testing the interaction with GC and shared strings.
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @requires vm.cds.archived.java.heap
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox GCDuringDumpTransformer GCSharedStringsDuringDumpWb
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm/timeout=480 GCSharedStringsDuringDump
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,9 +28,6 @@
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @requires vm.cds.archived.java.heap
* @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
* @build HumongousDuringDumpTransformer Hello
* @run main/othervm/timeout=240 HumongousDuringDump
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,10 +27,7 @@
* @summary Abort dumping if any of the new jigsaw vm options is specified.
* @requires vm.cds
* @library /test/lib ..
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
- * jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java
* @run driver CheckUnsupportedDumpingOptions
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,10 +28,7 @@
*
* @requires vm.cds & !vm.graal.enabled
* @library /test/lib ..
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
- * jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../test-classes/Hello.java ../test-classes/HelloMore.java
* @run driver JigsawOptionsCombo
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java Sat Aug 10 10:02:54 2019 -0400
@@ -31,8 +31,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver AppClassInCP
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java Sat Aug 10 10:02:54 2019 -0400
@@ -31,8 +31,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver CustomPackage
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java Sat Aug 10 10:02:54 2019 -0400
@@ -31,8 +31,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver MismatchedPatchModule
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,8 +30,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver PatchDir
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,8 +29,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver PatchJavaBase
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,8 +29,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver Simple
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,8 +30,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver SubClassOfPatchedClass
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,8 +29,7 @@
* @library ../..
* @library /test/hotspot/jtreg/testlibrary
* @library /test/lib
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build PatchMain
* @run driver TwoJars
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,10 +27,7 @@
* @summary AppCDS tests for testing -Xbootclasspath/a
* @requires vm.cds & !vm.graal.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
- * jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
* @compile src/jdk/test/Main.java
* @compile src/com/sun/tools/javac/MyMain.jasm
* @compile src/sun/nio/cs/ext/MyClass.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @requires vm.cds & !vm.graal.enabled
* @library ../..
* @library /test/lib
- * @modules java.compiler
- * java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile src/jdk/test/Main.java
* @compile src/com/sun/tools/javac/Main.jasm
* @compile src/com/sun/tools/javac/MyMain.jasm
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,8 +27,7 @@
* @summary Ensure that classes found in jimage takes precedence over classes found in -Xbootclasspath/a.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.compiler
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../../test-classes/DummyClassHelper.java
* @compile ../../test-classes/java/net/HttpCookie.jasm
* @compile ../../../javax/annotation/processing/FilerException.jasm
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java Sat Aug 10 10:02:54 2019 -0400
@@ -32,9 +32,7 @@
* @requires vm.cds & !vm.graal.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @modules java.base/jdk.internal.access
- * java.management
* jdk.jartool/sun.tools.jar
- * jdk.internal.jvmstat/sun.jvmstat.monitor
* @compile ../../test-classes/EmptyClassHelper.java
* @compile ../../test-classes/com/sun/tools/javac/Main.jasm
* @run driver EmptyClassInBootClassPath
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @compile ../../test-classes/Hello.java
* @run driver AddModules
* @summary sanity test the --add-modules option
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run driver AddOpens
* @summary sanity test the --add-opens option
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run driver AddReads
* @summary sanity test the --add-reads option
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run driver ExportModule
* @summary Tests involve exporting a module from the module path to a jar in the -cp.
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary JvmtiEnv::AddToBootstrapClassLoaderSearch and JvmtiEnv::AddToSystemClassLoaderSearch should disable AppCDS
* @requires vm.cds
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @compile ../../test-classes/JvmtiApp.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run main/othervm MainModuleOnly
* @summary Test some scenarios with a main modular jar specified in the --module-path and -cp options in the command line.
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run driver ModulePathAndCP
* @summary 2 sets of tests: one with only --module-path in the command line;
* another with both -cp and --module-path in the command line.
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java Sat Aug 10 10:02:54 2019 -0400
@@ -26,9 +26,7 @@
* @test
* @requires vm.hasJFR & vm.cds
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- * jdk.jartool/sun.tools.jar
- * jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
* @run driver ModulePathAndCP_JFR
* @summary Same as ModulePathAndCP, but add -XX:StartFlightRecording=dumponexit=true to the runtime
* options. This makes sure that the shared classes are compatible with both
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java Sat Aug 10 10:02:54 2019 -0400
@@ -25,8 +25,7 @@
/**
* @test
* @requires vm.cds
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @library ../..
* @library /test/lib
* @compile ../../test-classes/Hello.java
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,7 +28,6 @@
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @requires vm.cds
* @requires vm.flavor != "minimal"
- * @modules jdk.jartool/sun.tools.jar
* @build SimpleAgent Hello
* @run main/othervm DumpingWithJavaAgent
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -31,10 +31,6 @@
* /test/hotspot/jtreg/testlibrary/jvmti
* @requires vm.cds
* @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- * java.management
- * jdk.jartool/sun.tools.jar
- * java.instrument
* @build TransformUtil TransformerAgent ParallelLoad
* @run driver ParallelLoadAndTransformTest
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java Sat Aug 10 10:02:54 2019 -0400
@@ -35,10 +35,6 @@
* @requires vm.cds
* @requires vm.flavor != "minimal"
* @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
- * java.instrument
* @build TransformUtil TransformerAgent Interface Implementor
* @run main/othervm TransformRelatedClassesAppCDS Interface Implementor
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java Sat Aug 10 10:02:54 2019 -0400
@@ -35,10 +35,6 @@
* @requires vm.cds
* @requires vm.flavor != "minimal"
* @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
- * java.instrument
* @build TransformUtil TransformerAgent SubClass SuperClazz
* @run main/othervm TransformRelatedClassesAppCDS SuperClazz SubClass
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,11 +28,7 @@
* make sure class redefinition works with CDS.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.compiler
- * java.instrument
- * jdk.jartool/sun.tools.jar
- * java.base/jdk.internal.misc
- * java.management
+ * @modules jdk.jartool/sun.tools.jar
* @run driver RedefineClassHelper
* @build sun.hotspot.WhiteBox RedefineBasic
* @run driver RedefineBasicTest
--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java Sat Aug 10 10:02:54 2019 -0400
@@ -28,10 +28,7 @@
* make sure class redefinition works with CDS.
* @requires vm.cds
* @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.compiler
- * java.instrument
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @run driver RedefineClassHelper
* @build sun.hotspot.WhiteBox RedefineRunningMethods_SharedHelper
* @run driver RedefineRunningMethods_Shared
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java Sat Aug 10 10:02:54 2019 -0400
@@ -27,9 +27,7 @@
* @summary Test relevant combinations of command line flags with shared strings
* @requires vm.cds.archived.java.heap & vm.hasJFR
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
* @build HelloString
* @run driver FlagCombo
*/
@@ -40,9 +38,6 @@
* @comment A special test excluding the case that requires JFR
* @requires vm.cds.archived.java.heap & !vm.hasJFR
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- * jdk.jartool/sun.tools.jar
* @build HelloString
* @run driver FlagCombo noJfr
*/
--- a/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java Sat Aug 10 10:02:54 2019 -0400
@@ -29,10 +29,6 @@
* @requires vm.cds
* @requires vm.flavor != "minimal"
* @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
- * java.instrument
* @build TransformUtil TransformerAgent Interface Implementor
* @run main/othervm TransformRelatedClasses Interface Implementor
*/
--- a/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,10 +30,6 @@
* @requires vm.cds
* @requires vm.flavor != "minimal"
* @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
- * java.instrument
* @build TransformUtil TransformerAgent SubClass SuperClazz
* @run main/othervm TransformRelatedClasses SuperClazz SubClass
*/
--- a/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java Sat Aug 10 10:02:54 2019 -0400
@@ -30,10 +30,6 @@
* @requires vm.cds
* @requires vm.flavor != "minimal"
* @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- * jdk.jartool/sun.tools.jar
- * java.management
- * java.instrument
* @build TransformUtil TransformerAgent SubClass SuperClazz
* @compile myPkg2/SubClass.java myPkg1/SuperClazz.java
* @run main/othervm TransformRelatedClasses myPkg1.SuperClazz myPkg2.SubClass
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java Sat Aug 10 07:33:52 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2018, 2019, 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.
- */
-
-/**
- * @test
- * @bug 8175312
- * @summary Test clhsdb 'g1regiondetails' and 'scanoops' commands for G1GC
- * @requires vm.hasSA & (vm.bits == "64" & os.maxMemory > 8g)
- * @library /test/lib
- * @run main/othervm/timeout=2400 ClhsdbRegionDetailsScanOopsForG1
- */
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import jdk.test.lib.apps.LingeredApp;
-import jtreg.SkippedException;
-
-public class ClhsdbRegionDetailsScanOopsForG1 {
-
- public static void main(String[] args) throws Exception {
- System.out.println("Starting ClhsdbRegionDetailsScanOopsForG1 test");
-
- LingeredAppWithLargeStringArray theApp = null;
- try {
- ClhsdbLauncher test = new ClhsdbLauncher();
- List<String> vmArgs = new ArrayList<String>();
- vmArgs.add("-XX:+UseG1GC");
- vmArgs.add("-Xmx8g");
- vmArgs.add("-XX:G1HeapRegionSize=2m");
-
- theApp = new LingeredAppWithLargeStringArray();
- LingeredApp.startApp(vmArgs, theApp);
- System.out.println("Started LingeredAppWithLargeStringArray with pid " + theApp.getPid());
-
- List<String> cmds = List.of("g1regiondetails");
- Map<String, List<String>> expStrMap = new HashMap<>();
- Map<String, List<String>> unExpStrMap = new HashMap<>();
-
- // Test that the various types of regions are listed with the
- // 'g1regiondetails' command
- expStrMap.put("g1regiondetails", List.of(
- "Region",
- "Eden",
- "Survivor",
- "StartsHumongous",
- "ContinuesHumongous",
- "Free"));
- unExpStrMap.put("g1regiondetails", List.of("Unknown Region Type"));
- String regionDetailsOutput = test.run(theApp.getPid(), cmds,
- expStrMap, unExpStrMap);
- // Test the output of 'scanoops' -- get the start and end addresses
- // from the StartsHumongous region. Ensure that it contains an
- // array of Strings.
- String[] snippets = regionDetailsOutput.split(":StartsHumongous");
- snippets = snippets[0].split("Region: ");
- String[] words = snippets[snippets.length - 1].split(",");
- // words[0] and words[1] represent the start and end addresses
- String cmd = "scanoops " + words[0] + " " + words[1];
- expStrMap = new HashMap<>();
- expStrMap.put(cmd, List.of("\\[Ljava/lang/String"));
- test.run(theApp.getPid(), List.of(cmd), expStrMap, null);
- } catch (SkippedException e) {
- throw e;
- } catch (Exception ex) {
- throw new RuntimeException("Test ERROR " + ex, ex);
- } finally {
- LingeredApp.stopApp(theApp);
- }
- System.out.println("Test PASSED");
- }
-}
--- a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLargeArray.java Sat Aug 10 07:33:52 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2017, 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.
- */
-
-import jdk.test.lib.apps.LingeredApp;
-
-public class LingeredAppWithLargeArray extends LingeredApp {
- public static void main(String args[]) {
- int[] hugeArray = new int[Integer.MAX_VALUE/2];
- LingeredApp.main(args);
- }
- }
--- a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLargeStringArray.java Sat Aug 10 07:33:52 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, 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.
- */
-
-import jdk.test.lib.apps.LingeredApp;
-
-public class LingeredAppWithLargeStringArray extends LingeredApp {
- public static void main(String args[]) {
- String[] hugeArray = new String[Integer.MAX_VALUE/8];
- String[] smallArray = {"Just", "for", "testing"};
- for (int i = 0; i < hugeArray.length/16; i++) {
- hugeArray[i] = new String(smallArray[i%3]);
- }
- LingeredApp.main(args);
- }
- }
--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java Sat Aug 10 07:33:52 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2017, 2019, 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.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.io.File;
-import java.nio.file.Files;
-import java.io.IOException;
-import java.io.BufferedInputStream;
-import java.util.stream.Collectors;
-import java.io.FileInputStream;
-
-import sun.jvm.hotspot.HotSpotAgent;
-import sun.jvm.hotspot.debugger.*;
-
-import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.Utils;
-import jdk.test.lib.Asserts;
-
-/**
- * @test
- * @library /test/lib
- * @bug 8171084
- * @requires vm.hasSAandCanAttach & (vm.bits == "64" & os.maxMemory > 8g)
- * @modules java.base/jdk.internal.misc
- * jdk.hotspot.agent/sun.jvm.hotspot
- * jdk.hotspot.agent/sun.jvm.hotspot.utilities
- * jdk.hotspot.agent/sun.jvm.hotspot.oops
- * jdk.hotspot.agent/sun.jvm.hotspot.debugger
- * @run main/timeout=1800/othervm -Xmx8g TestHeapDumpForLargeArray
- */
-
-public class TestHeapDumpForLargeArray {
-
- private static LingeredAppWithLargeArray theApp = null;
-
- private static void attachAndDump(String heapDumpFileName,
- long lingeredAppPid) throws Exception {
-
- JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
- launcher.addToolArg("jmap");
- launcher.addToolArg("--binaryheap");
- launcher.addToolArg("--dumpfile");
- launcher.addToolArg(heapDumpFileName);
- launcher.addToolArg("--pid");
- launcher.addToolArg(Long.toString(lingeredAppPid));
-
- ProcessBuilder processBuilder = new ProcessBuilder();
- processBuilder.command(launcher.getCommand());
- System.out.println(
- processBuilder.command().stream().collect(Collectors.joining(" ")));
-
- OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder);
- SAOutput.shouldHaveExitValue(0);
- SAOutput.shouldNotContain("Heap segment size overflow");
- SAOutput.shouldContain("truncating to");
- SAOutput.shouldContain("heap written to");
- SAOutput.shouldContain(heapDumpFileName);
- System.out.println(SAOutput.getOutput());
-
- }
-
- public static void main (String... args) throws Exception {
-
- String heapDumpFileName = "LargeArrayHeapDump.bin";
-
- File heapDumpFile = new File(heapDumpFileName);
- if (heapDumpFile.exists()) {
- heapDumpFile.delete();
- }
-
- try {
- // Need to add the default arguments first to have explicit
- // -Xmx8g last, otherwise test will fail if default
- // arguments contain a smaller -Xmx.
- List<String> vmArgs = new ArrayList<String>();
- vmArgs.addAll(Utils.getVmOptions());
- vmArgs.add("-XX:+UsePerfData");
- vmArgs.add("-Xmx8g");
-
- theApp = new LingeredAppWithLargeArray();
- LingeredApp.startApp(vmArgs, theApp);
- attachAndDump(heapDumpFileName, theApp.getPid());
- } finally {
- LingeredApp.stopApp(theApp);
- heapDumpFile.delete();
- }
- }
-}
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.java Sat Aug 10 07:33:52 2019 -0400
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.java Sat Aug 10 10:02:54 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -53,7 +53,7 @@
WhiteBox wb = WhiteBox.getWhiteBox();
long heapAlignment = wb.getHeapAlignment();
long alignedHeapSize = GCHelper.alignUp(megabytes(100), heapAlignment);
- verifyMinHeapSizeIs(megabytes(100));
+ verifyMinHeapSizeIs(alignedHeapSize);
verifyInitialHeapSizeIs(alignedHeapSize);
verifyMaxHeapSizeIs(alignedHeapSize);
verifyUsesCompressedOopsIs(true);