changeset 10569:b64432bae527 jdk-9+114

8153737: Unsupported Module Reviewed-by: alanb, mchung, psandoz
author chegar
date Sat, 09 Apr 2016 23:03:39 +0100
parents 280fdc039980
children 5e398099492a 481c1998b2ef 7bc36b9ff1e7
files src/jdk.vm.ci/share/classes/module-info.java test/compiler/arguments/CheckCICompilerCount.java test/compiler/arguments/CheckCompileThresholdScaling.java test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java test/compiler/c2/6589834/Test_ia32.java test/compiler/c2/6857159/Test6857159.java test/compiler/c2/6968348/Test6968348.java test/compiler/c2/7068051/Test7068051.java test/compiler/c2/7190310/Test7190310_unsafe.java test/compiler/c2/8004867/TestIntUnsafeCAS.java test/compiler/c2/8004867/TestIntUnsafeOrdered.java test/compiler/c2/8004867/TestIntUnsafeVolatile.java test/compiler/c2/8005956/PolynomialRoot.java test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java test/compiler/codecache/CheckSegmentedCodeCache.java test/compiler/codecache/CheckUpperLimit.java test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java test/compiler/codecache/jmx/GetUsageTest.java test/compiler/codecache/jmx/InitialAndMaxUsageTest.java test/compiler/codecache/jmx/PeakUsageTest.java test/compiler/codecache/jmx/ThresholdNotificationsTest.java test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java test/compiler/codecache/jmx/UsageThresholdExceededTest.java test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java test/compiler/codecache/stress/OverloadCompileQueueTest.java test/compiler/codecache/stress/RandomAllocationTest.java test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java test/compiler/codegen/6896617/Test6896617.java test/compiler/codegen/7100757/Test7100757.java test/compiler/codegen/7184394/TestAESMain.java test/compiler/codegen/8011901/Test8011901.java test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java test/compiler/cpuflags/RestoreMXCSR.java test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java test/compiler/debug/VerifyAdapterSharing.java test/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java test/compiler/intrinsics/bmi/TestAndnI.java test/compiler/intrinsics/bmi/TestAndnL.java test/compiler/intrinsics/bmi/TestBlsiI.java test/compiler/intrinsics/bmi/TestBlsiL.java test/compiler/intrinsics/bmi/TestBlsmskI.java test/compiler/intrinsics/bmi/TestBlsmskL.java test/compiler/intrinsics/bmi/TestBlsrI.java test/compiler/intrinsics/bmi/TestBlsrL.java test/compiler/intrinsics/bmi/TestLzcntI.java test/compiler/intrinsics/bmi/TestLzcntL.java test/compiler/intrinsics/bmi/TestTzcntI.java test/compiler/intrinsics/bmi/TestTzcntL.java test/compiler/intrinsics/bmi/verifycode/AndnTestI.java test/compiler/intrinsics/bmi/verifycode/AndnTestL.java test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java test/compiler/intrinsics/mathexact/AddExactIConstantTest.java test/compiler/intrinsics/mathexact/AddExactILoadTest.java test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java test/compiler/intrinsics/mathexact/AddExactLConstantTest.java test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java test/compiler/intrinsics/mathexact/DecExactITest.java test/compiler/intrinsics/mathexact/DecExactLTest.java test/compiler/intrinsics/mathexact/IncExactITest.java test/compiler/intrinsics/mathexact/IncExactLTest.java test/compiler/intrinsics/mathexact/MulExactIConstantTest.java test/compiler/intrinsics/mathexact/MulExactILoadTest.java test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java test/compiler/intrinsics/mathexact/MulExactLConstantTest.java test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java test/compiler/intrinsics/mathexact/NegExactIConstantTest.java test/compiler/intrinsics/mathexact/NegExactILoadTest.java test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java test/compiler/intrinsics/mathexact/NegExactLConstantTest.java test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java test/compiler/intrinsics/mathexact/SubExactICondTest.java test/compiler/intrinsics/mathexact/SubExactIConstantTest.java test/compiler/intrinsics/mathexact/SubExactILoadTest.java test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java test/compiler/intrinsics/mathexact/SubExactLConstantTest.java test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java test/compiler/jsr292/ConcurrentClassLoadingTest.java test/compiler/jsr292/VMAnonymousClasses.java test/compiler/oracle/CheckCompileCommandOption.java test/compiler/oracle/TestCompileCommand.java test/compiler/profiling/spectrapredefineclass/Launcher.java test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java test/compiler/rangechecks/TestRangeCheckSmearing.java test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestRTMAbortThresholdOption.java test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java test/compiler/rtm/cli/TestRTMLockingThresholdOption.java test/compiler/rtm/cli/TestRTMRetryCountOption.java test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java test/compiler/rtm/locking/TestRTMAbortRatio.java test/compiler/rtm/locking/TestRTMAbortThreshold.java test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java test/compiler/rtm/locking/TestRTMLockingThreshold.java test/compiler/rtm/locking/TestRTMRetryCount.java test/compiler/rtm/locking/TestRTMSpinLoopCount.java test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java test/compiler/rtm/locking/TestUseRTMDeopt.java test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java test/compiler/rtm/locking/TestUseRTMForStackLocks.java test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java test/compiler/runtime/8010927/Test8010927.java test/compiler/startup/NumCompilerThreadsCheck.java test/compiler/startup/SmallCodeCacheStartup.java test/compiler/startup/StartupOutput.java test/compiler/tiered/ConstantGettersTransitionsTest.java test/compiler/tiered/LevelTransitionTest.java test/compiler/types/TestMeetIncompatibleInterfaceArrays.java test/compiler/types/correctness/CorrectnessTest.java test/compiler/types/correctness/OffTest.java test/compiler/uncommontrap/TestUnstableIfTrap.java test/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java test/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java test/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java test/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java test/compiler/unsafe/SunMiscUnsafeAccessTestObject.java test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java test/compiler/unsafe/UnsafeRaw.java test/compiler/unsafe/X-UnsafeAccessTest.java.template test/compiler/unsafe/generate-unsafe-access-tests.sh test/compiler/whitebox/IsMethodCompilableTest.java test/gc/TestCardTablePageCommits.java test/gc/TestObjectAlignment.java test/gc/TestSoftReferencesBehaviorOnOOME.java test/gc/TestVerifyDuringStartup.java test/gc/TestVerifySilently.java test/gc/TestVerifySubSet.java test/gc/arguments/TestArrayAllocatorMallocLimit.java test/gc/arguments/TestCMSHeapSizeFlags.java test/gc/arguments/TestCompressedClassFlags.java test/gc/arguments/TestG1ConcMarkStepDurationMillis.java test/gc/arguments/TestG1ConcRefinementThreads.java test/gc/arguments/TestG1HeapSizeFlags.java test/gc/arguments/TestG1PercentageOptions.java test/gc/arguments/TestHeapFreeRatio.java test/gc/arguments/TestInitialTenuringThreshold.java test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java test/gc/arguments/TestMaxNewSize.java test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java test/gc/arguments/TestMinInitialErgonomics.java test/gc/arguments/TestNewRatioFlag.java test/gc/arguments/TestNewSizeFlags.java test/gc/arguments/TestNewSizeThreadIncrease.java test/gc/arguments/TestObjectTenuringFlags.java test/gc/arguments/TestParallelGCThreads.java test/gc/arguments/TestParallelHeapSizeFlags.java test/gc/arguments/TestSelectDefaultGC.java test/gc/arguments/TestSerialHeapSizeFlags.java test/gc/arguments/TestSurvivorAlignmentInBytesOption.java test/gc/arguments/TestSurvivorRatioFlag.java test/gc/arguments/TestTargetSurvivorRatioFlag.java test/gc/arguments/TestUnrecognizedVMOptionsHandling.java test/gc/arguments/TestUseCompressedOopsErgo.java test/gc/arguments/TestUseNUMAInterleaving.java test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java test/gc/class_unloading/TestG1ClassUnloadingHWM.java test/gc/cms/GuardShrinkWarning.java test/gc/g1/Test2GbHeap.java test/gc/g1/TestEagerReclaimHumongousRegions.java test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java test/gc/g1/TestGCLogMessages.java test/gc/g1/TestHumongousAllocInitialMark.java test/gc/g1/TestHumongousCodeCacheRoots.java test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java test/gc/g1/TestPLABSizeBounds.java test/gc/g1/TestPrintRegionRememberedSetInfo.java test/gc/g1/TestRemsetLogging.java test/gc/g1/TestRemsetLoggingPerRegion.java test/gc/g1/TestRemsetLoggingThreads.java test/gc/g1/TestShrinkAuxiliaryData00.java test/gc/g1/TestShrinkAuxiliaryData05.java test/gc/g1/TestShrinkAuxiliaryData10.java test/gc/g1/TestShrinkAuxiliaryData15.java test/gc/g1/TestShrinkAuxiliaryData20.java test/gc/g1/TestShrinkAuxiliaryData25.java test/gc/g1/TestShrinkAuxiliaryData30.java test/gc/g1/TestShrinkDefragmentedHeap.java test/gc/g1/TestStringDeduplicationAgeThreshold.java test/gc/g1/TestStringDeduplicationFullGC.java test/gc/g1/TestStringDeduplicationInterned.java test/gc/g1/TestStringDeduplicationPrintOptions.java test/gc/g1/TestStringDeduplicationTableRehash.java test/gc/g1/TestStringDeduplicationTableResize.java test/gc/g1/TestStringDeduplicationYoungGC.java test/gc/g1/TestStringSymbolTableStats.java test/gc/logging/TestDeprecatedPrintFlags.java test/gc/logging/TestGCId.java test/gc/logging/TestPrintReferences.java test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java test/gc/metaspace/TestCapacityUntilGCWrapAround.java test/gc/metaspace/TestMetaspaceMemoryPool.java test/gc/metaspace/TestMetaspacePerfCounters.java test/gc/metaspace/TestMetaspaceSizeFlags.java test/gc/metaspace/TestPerfCountersAndMemoryPools.java test/gc/parallel/AdaptiveGCBoundary.java test/gc/serial/HeapChangeLogging.java test/gc/startup_warnings/TestCMS.java test/gc/startup_warnings/TestDefNewCMS.java test/gc/startup_warnings/TestG1.java test/gc/startup_warnings/TestParNewCMS.java test/gc/startup_warnings/TestParNewSerialOld.java test/gc/startup_warnings/TestParallelGC.java test/gc/startup_warnings/TestParallelScavengeSerialOld.java test/gc/startup_warnings/TestSerialGC.java test/gc/survivorAlignment/TestAllocationInEden.java test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java test/gc/survivorAlignment/TestPromotionToSurvivor.java test/gc/whitebox/TestConcMarkCycleWB.java test/gc/whitebox/TestWBGC.java test/runtime/8003720/Test8003720.java test/runtime/8026365/InvokeSpecialAnonTest.java test/runtime/BadObjectClass/BootstrapRedefine.java test/runtime/BootClassAppendProp/BootClassPathAppend.java test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java test/runtime/CDSCompressedKPtrs/XShareAuto.java test/runtime/ClassFile/JsrRewriting.java test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java test/runtime/ClassFile/UnsupportedClassFileVersion.java test/runtime/CommandLine/BooleanFlagWithInvalidValue.java test/runtime/CommandLine/CompilerConfigFileWarning.java test/runtime/CommandLine/ConfigFileParsing.java test/runtime/CommandLine/ConfigFileWarning.java test/runtime/CommandLine/FlagWithInvalidValue.java test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java test/runtime/CommandLine/PrintTouchedMethods.java test/runtime/CommandLine/TestHexArguments.java test/runtime/CommandLine/TestNullTerminatedFlags.java test/runtime/CommandLine/TestVMOptions.java test/runtime/CommandLine/TraceExceptionsTest.java test/runtime/CommandLine/UnrecognizedVMOption.java test/runtime/CommandLine/VMOptionWarning.java test/runtime/CompressedOops/CompressedClassPointers.java test/runtime/CompressedOops/CompressedClassSpaceSize.java test/runtime/CompressedOops/CompressedKlassPointerAndOops.java test/runtime/CompressedOops/ObjectAlignment.java test/runtime/CompressedOops/UseCompressedOops.java test/runtime/EnclosingMethodAttr/EnclMethodAttr.java test/runtime/ErrorHandling/CreateCoredumpOnCrash.java test/runtime/ErrorHandling/ProblematicFrameTest.java test/runtime/ErrorHandling/SecondaryErrorTest.java test/runtime/LoadClass/LoadClassNegative.java test/runtime/LocalVariableTable/TestLVT.java test/runtime/NMT/AutoshutdownNMT.java test/runtime/NMT/BaselineWithParameter.java test/runtime/NMT/CommandLineDetail.java test/runtime/NMT/CommandLineEmptyArgument.java test/runtime/NMT/CommandLineInvalidArgument.java test/runtime/NMT/CommandLineSummary.java test/runtime/NMT/CommandLineTurnOffNMT.java test/runtime/NMT/JcmdBaselineDetail.java test/runtime/NMT/JcmdDetailDiff.java test/runtime/NMT/JcmdScale.java test/runtime/NMT/JcmdScaleDetail.java test/runtime/NMT/JcmdSummaryDiff.java test/runtime/NMT/JcmdWithNMTDisabled.java test/runtime/NMT/MallocRoundingReportTest.java test/runtime/NMT/MallocStressTest.java test/runtime/NMT/MallocTestType.java test/runtime/NMT/MallocTrackingVerify.java test/runtime/NMT/NMTWithCDS.java test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java test/runtime/NMT/ReleaseNoCommit.java test/runtime/NMT/ShutdownTwice.java test/runtime/NMT/SummaryAfterShutdown.java test/runtime/NMT/SummarySanityCheck.java test/runtime/NMT/ThreadedMallocTestType.java test/runtime/NMT/ThreadedVirtualAllocTestType.java test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java test/runtime/NMT/VirtualAllocTestType.java test/runtime/PerfMemDestroy/PerfMemDestroy.java test/runtime/RedefineObject/TestRedefineObject.java test/runtime/Safepoint/AssertSafepointCheckConsistency1.java test/runtime/Safepoint/AssertSafepointCheckConsistency2.java test/runtime/Safepoint/AssertSafepointCheckConsistency3.java test/runtime/Safepoint/AssertSafepointCheckConsistency4.java test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java test/runtime/SharedArchiveFile/DefaultUseWithClient.java test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java test/runtime/SharedArchiveFile/LimitSharedSizes.java test/runtime/SharedArchiveFile/MaxMetaspaceSize.java test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java test/runtime/SharedArchiveFile/SharedArchiveFile.java test/runtime/SharedArchiveFile/SharedBaseAddress.java test/runtime/SharedArchiveFile/SharedStrings.java test/runtime/SharedArchiveFile/SharedStringsRunAuto.java test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java test/runtime/Thread/TestThreadDumpMonitorContention.java test/runtime/Thread/ThreadPriorities.java test/runtime/Unsafe/AllocateInstance.java test/runtime/Unsafe/AllocateMemory.java test/runtime/Unsafe/CopyMemory.java test/runtime/Unsafe/DefineClass.java test/runtime/Unsafe/FieldOffset.java test/runtime/Unsafe/GetField.java test/runtime/Unsafe/GetKlassPointerGetJavaMirror.java test/runtime/Unsafe/GetPutAddress.java test/runtime/Unsafe/GetPutBoolean.java test/runtime/Unsafe/GetPutByte.java test/runtime/Unsafe/GetPutChar.java test/runtime/Unsafe/GetPutDouble.java test/runtime/Unsafe/GetPutFloat.java test/runtime/Unsafe/GetPutInt.java test/runtime/Unsafe/GetPutLong.java test/runtime/Unsafe/GetPutObject.java test/runtime/Unsafe/GetPutShort.java test/runtime/Unsafe/GetUncompressedObject.java test/runtime/Unsafe/GetUnsafe.java test/runtime/Unsafe/PageSize.java test/runtime/Unsafe/RangeCheck.java test/runtime/Unsafe/Reallocate.java test/runtime/Unsafe/SetMemory.java test/runtime/Unsafe/ThrowException.java test/runtime/XCheckJniJsig/XCheckJSig.java test/runtime/classFileParserBug/ClassFileParserBug.java test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java test/runtime/contended/Options.java test/runtime/duplAttributes/DuplAttributesTest.java test/runtime/logging/BiasedLockingTest.java test/runtime/logging/DefaultMethodsTest.java test/runtime/logging/ExceptionsTest.java test/runtime/logging/ItablesTest.java test/runtime/logging/ModulesTest.java test/runtime/logging/MonitorInflationTest.java test/runtime/logging/SafepointTest.java test/runtime/logging/StartupTimeTest.java test/runtime/logging/ThreadLoggingTest.java test/runtime/logging/VMOperationTest.java test/runtime/logging/VtablesTest.java test/runtime/memory/LargePages/TestLargePageSizeInBytes.java test/runtime/memory/LargePages/TestLargePagesFlags.java test/runtime/memory/ReadFromNoaccessArea.java test/runtime/memory/ReserveMemory.java test/runtime/memory/RunUnitTestsConcurrently.java test/runtime/modules/AccModuleTest.java test/runtime/modules/Visibility/XbootcpNoVisibility.java test/runtime/modules/Visibility/XbootcpVisibility.java test/runtime/modules/Visibility/XpatchVisibility.java test/runtime/modules/XpatchCDS.java test/runtime/verifier/OverriderMsg.java test/runtime/verifier/TestANewArray.java test/runtime/verifier/TestMultiANewArray.java test/serviceability/attach/AttachSetGetFlag.java test/serviceability/dcmd/compiler/CodeCacheTest.java test/serviceability/dcmd/compiler/CodelistTest.java test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java test/serviceability/dcmd/compiler/CompilerQueueTest.java test/serviceability/dcmd/framework/HelpTest.java test/serviceability/dcmd/framework/InvalidCommandTest.java test/serviceability/dcmd/framework/VMVersionTest.java test/serviceability/dcmd/gc/ClassHistogramAllTest.java test/serviceability/dcmd/gc/ClassHistogramTest.java test/serviceability/dcmd/gc/HeapDumpAllTest.java test/serviceability/dcmd/gc/HeapDumpTest.java test/serviceability/dcmd/gc/RunFinalizationTest.java test/serviceability/dcmd/gc/RunGCTest.java test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java test/serviceability/dcmd/thread/PrintTest.java test/serviceability/dcmd/vm/ClassHierarchyTest.java test/serviceability/dcmd/vm/ClassLoaderStatsTest.java test/serviceability/dcmd/vm/CommandLineTest.java test/serviceability/dcmd/vm/DynLibsTest.java test/serviceability/dcmd/vm/FlagsTest.java test/serviceability/dcmd/vm/SystemPropertiesTest.java test/serviceability/dcmd/vm/UptimeTest.java test/serviceability/jvmti/GetObjectSizeOverflow.java test/serviceability/jvmti/TestLambdaFormRetransformation.java test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java test/serviceability/logging/TestLogRotation.java test/serviceability/sa/jmap-hashcode/Test8028623.java test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java test/stress/gc/TestStressRSetCoarsening.java test/testlibrary_tests/OutputAnalyzerReportingTest.java test/testlibrary_tests/OutputAnalyzerTest.java test/testlibrary_tests/RandomGeneratorTest.java test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java test/testlibrary_tests/TestPlatformIsTieredSupported.java test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java test/testlibrary_tests/whitebox/vm_flags/UintxTest.java
diffstat 485 files changed, 513 insertions(+), 478 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.vm.ci/share/classes/module-info.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/src/jdk.vm.ci/share/classes/module-info.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,6 +24,9 @@
  */
 
 module jdk.vm.ci {
+    // 8153756
+    requires jdk.unsupported;
+
     uses jdk.vm.ci.hotspot.HotSpotVMEventListener;
     uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
     uses jdk.vm.ci.runtime.JVMCICompilerFactory;
--- a/test/compiler/arguments/CheckCICompilerCount.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/CheckCICompilerCount.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @bug 8132525
  * @summary Check that correct range of values for CICompilerCount are allowed depending on whether tiered is enabled or not
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CheckCICompilerCount
  */
--- a/test/compiler/arguments/CheckCompileThresholdScaling.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/CheckCompileThresholdScaling.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8059604
  * @summary "Add CompileThresholdScaling flag to control when methods are first compiled (with +/-TieredCompilation)"
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CheckCompileThresholdScaling
  */
--- a/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify processing of UseBMI1Instructions option on CPU with
  *          BMI1 feature support.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseBMI1InstructionsOnSupportedCPU
  *        BMISupportedCPUTest
--- a/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify processing of UseBMI1Instructions option on CPU without
  *          BMI1 feature support.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseBMI1InstructionsOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
--- a/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify processing of UseCountLeadingZerosInstruction option
  *          on CPU with LZCNT support.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseCountLeadingZerosInstructionOnSupportedCPU
  *        BMISupportedCPUTest
--- a/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify processing of UseCountLeadingZerosInstruction option
  *          on CPU without LZCNT support.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseCountLeadingZerosInstructionOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
--- a/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify processing of UseCountTrailingZerosInstruction option
  *          on CPU with TZCNT (BMI1 feature) support.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseCountTrailingZerosInstructionOnSupportedCPU
  *        BMISupportedCPUTest
--- a/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify processing of UseCountTrailingZerosInstruction option
  *          on CPU without TZCNT instruction (BMI1 feature) support.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseCountTrailingZerosInstructionOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
--- a/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8072016
  * @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation
  * @library /testlibrary /test/lib /compiler/whitebox /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestArrayCopyNoInitDeopt
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/c2/6589834/Test_ia32.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/6589834/Test_ia32.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Safepoint placed between stack pointer increment and decrement leads
  *          to interpreter's stack corruption after deoptimization.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/compiler/c2/6857159/Test6857159.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/6857159/Test6857159.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 6857159
  * @summary local schedule failed with checkcast of Thread.currentThread()
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/compiler/c2/6968348/Test6968348.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/6968348/Test6968348.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 6968348
  * @summary Byteswapped memory access can point to wrong location after JIT
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main Test6968348
  */
 
--- a/test/compiler/c2/7068051/Test7068051.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/7068051/Test7068051.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary SIGSEGV in PhaseIdealLoop::build_loop_late_post on T5440
  * @library /testlibrary
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -showversion -Xbatch Test7068051
  */
--- a/test/compiler/c2/7190310/Test7190310_unsafe.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/7190310/Test7190310_unsafe.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @test
  * @bug 7190310
  * @summary Inlining WeakReference.get(), and hoisting $referent may lead to non-terminating loops
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm -Xbatch Test7190310_unsafe
  */
 
--- a/test/compiler/c2/8004867/TestIntUnsafeCAS.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/8004867/TestIntUnsafeCAS.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8004867
  * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeCAS
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeCAS
  */
--- a/test/compiler/c2/8004867/TestIntUnsafeOrdered.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/8004867/TestIntUnsafeOrdered.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8004867
  * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeOrdered
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeOrdered
  */
--- a/test/compiler/c2/8004867/TestIntUnsafeVolatile.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/8004867/TestIntUnsafeVolatile.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8004867
  * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob"
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeVolatile
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeVolatile
  */
--- a/test/compiler/c2/8005956/PolynomialRoot.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/c2/8005956/PolynomialRoot.java	Sat Apr 09 23:03:39 2016 +0100
@@ -14,7 +14,7 @@
 * @bug 8005956
 * @summary C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 * @run main/timeout=300 PolynomialRoot
 */
--- a/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java	Sat Apr 09 23:03:39 2016 +0100
@@ -34,7 +34,7 @@
  * @bug 8054402
  * @summary "Tests unloading of anonymous classes."
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @compile TestAnonymousClassUnloading.java
  * @run main ClassFileInstaller TestAnonymousClassUnloading
  *                              sun.hotspot.WhiteBox
--- a/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  *          InitialCodeCacheSize are passed to the VM is irrelevant.
  * @library /testlibrary
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/codecache/CheckSegmentedCodeCache.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/CheckSegmentedCodeCache.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @bug 8015774
  * @library /testlibrary /test/lib
  * @summary "Checks VM options related to the segmented code cache"
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build CheckSegmentedCodeCache
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/CheckUpperLimit.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/CheckUpperLimit.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Test ensures that the ReservedCodeCacheSize is at most MAXINT
  * @library /testlibrary
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @bug 8015774
  * @summary Verify SegmentedCodeCache option's processing
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -32,7 +32,7 @@
  * @bug 8015774
  * @summary Verify processing of options related to code heaps sizing.
  * @library /testlibrary .. /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @bug 8015774
  * @summary Verify that PrintCodeCache option print correct information.
  * @library /testlibrary .. /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/compiler/codecache/jmx/GetUsageTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/GetUsageTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
 /*
  * @test GetUsageTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build GetUsageTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
 /*
  * @test InitialAndMaxUsageTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build InitialAndMaxUsageTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/PeakUsageTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/PeakUsageTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @test PeakUsageTest
  * @ignore 8151345
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build PeakUsageTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/ThresholdNotificationsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/ThresholdNotificationsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -35,7 +35,7 @@
 /*
  * @test ThresholdNotificationsTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ThresholdNotificationsTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test UsageThresholdExceededSeveralTimesTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build UsageThresholdExceededTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/UsageThresholdExceededTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/UsageThresholdExceededTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
 /*
  * @test UsageThresholdExceededTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build UsageThresholdExceededTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
 /*
  * @test UsageThresholdIncreasedTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build UsageThresholdIncreasedTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
 /*
  * @test UsageThresholdNotExceededTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build UsageThresholdNotExceededTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/stress/OverloadCompileQueueTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/stress/OverloadCompileQueueTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
 /*
  * @test OverloadCompileQueueTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8071905
  * @build OverloadCompileQueueTest
--- a/test/compiler/codecache/stress/RandomAllocationTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/stress/RandomAllocationTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
 /*
  * @test RandomAllocationTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build RandomAllocationTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
 /*
  * @test UnexpectedDeoptimizationTest
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build UnexpectedDeoptimizationTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codegen/6896617/Test6896617.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codegen/6896617/Test6896617.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 6896617
  * @summary Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() with SSE instructions on x86
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.base/sun.nio.cs
  *          java.management
  * @run main/othervm/timeout=1200 -Xbatch -Xmx256m Test6896617
--- a/test/compiler/codegen/7100757/Test7100757.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codegen/7100757/Test7100757.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 7100757
  * @summary The BitSet.nextSetBit() produces incorrect result in 32bit VM on Sparc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/timeout=300 Test7100757
  */
--- a/test/compiler/codegen/7184394/TestAESMain.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codegen/7184394/TestAESMain.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary add intrinsics to use AES instructions
  * @library /testlibrary
  *
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm/timeout=600 -Xbatch -DcheckOutput=true -Dmode=CBC TestAESMain
  * @run main/othervm/timeout=600 -Xbatch -DcheckOutput=true -Dmode=CBC -DencInputOffset=1 TestAESMain
--- a/test/compiler/codegen/8011901/Test8011901.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/codegen/8011901/Test8011901.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8011901
  * @summary instruct xaddL_no_res shouldn't allow 64 bit constants.
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm -XX:-BackgroundCompilation Test8011901
  *
  */
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test TestCompilerDirectivesCompatibilityBase
  * @bug 8137167
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  * @build jdk.test.lib.*
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test TestCompilerDirectivesCompatibilityCommandOff
  * @bug 8137167
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  * @build jdk.test.lib.*
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test TestCompilerDirectivesCompatibilityCommandOn
  * @bug 8137167
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  * @build jdk.test.lib.*
--- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test TestCompilerDirectivesCompatibilityFlag
  * @bug 8137167
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  * @build jdk.test.lib.*
--- a/test/compiler/cpuflags/RestoreMXCSR.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/cpuflags/RestoreMXCSR.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8020433
  * @summary Crash when using -XX:+RestoreMXCSROnJNICalls
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary /compiler/codegen/7184394
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8146128
  * @build TestAESIntrinsicsOnSupportedConfig TestAESMain
--- a/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary /compiler/codegen/7184394
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestAESIntrinsicsOnUnsupportedConfig TestAESMain
  * @run main ClassFileInstaller
--- a/test/compiler/debug/VerifyAdapterSharing.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/debug/VerifyAdapterSharing.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8030783
  * @summary Regression test for 8026478
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java	Sat Apr 09 23:03:39 2016 +0100
@@ -34,7 +34,7 @@
  * @bug 8050079
  * @summary Compiles a monomorphic call to finalizeObject() on a modified java.lang.Object to test C1 CHA.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  *          java.base/jdk.internal
  * @ignore 8132924
--- a/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8038048
  * @summary assert(null_obj->escape_state() == PointsToNode::NoEscape,etc)
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+DoEscapeAnalysis -XX:-TieredCompilation -Xbatch TestUnsafePutAddressNullObjMustNotEscape
  * @author Richard Reingruber richard DOT reingruber AT sap DOT com
  */
--- a/test/compiler/intrinsics/bmi/TestAndnI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestAndnI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of ANDN instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestAndnI BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestAndnL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestAndnL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of ANDN instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestAndnL BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestBlsiI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestBlsiI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSI instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestBlsiI BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestBlsiL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestBlsiL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSI instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestBlsiL BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestBlsmskI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestBlsmskI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSMSK instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestBlsmskI BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestBlsmskL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestBlsmskL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSMSK instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestBlsmskL BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestBlsrI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestBlsrI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSR instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestBlsrI BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestBlsrL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestBlsrL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSR instruction
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestBlsrL BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestLzcntI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestLzcntI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestLzcntI BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestLzcntL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestLzcntL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestLzcntL BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestTzcntI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestTzcntI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestTzcntI BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/TestTzcntL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/TestTzcntL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestTzcntL BMITestRunner Expr
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AndnTestI
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AndnTestL
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsiTestI
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsiTestL
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsmskTestI
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsmskTestL
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsrTestI
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsrTestL
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build LZcntTestI
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build LZcntTestL
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TZcntTestI
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8031321
  * @library /testlibrary /test/lib /compiler/whitebox / ..
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TZcntTestL
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8054492
  * @summary "Casting can result in redundant null checks in generated code"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
  * @build NullCheckDroppingsTest
--- a/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8024924
  * @summary Test constant addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactIConstantTest.java Verify.java
  * @run main AddExactIConstantTest
--- a/test/compiler/intrinsics/mathexact/AddExactILoadTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactILoadTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8024924
  * @summary Test non constant addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactILoadTest.java Verify.java
  * @run main AddExactILoadTest
--- a/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8024924
  * @summary Test non constant addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactILoopDependentTest.java Verify.java
  * @run main AddExactILoopDependentTest
--- a/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8024924
  * @summary Test non constant addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactINonConstantTest.java Verify.java
  * @run main AddExactINonConstantTest
--- a/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8025657
  * @summary Test repeating addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactIRepeatTest.java Verify.java
  * @run main AddExactIRepeatTest
--- a/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactLConstantTest.java Verify.java
  * @run main AddExactLConstantTest
--- a/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant addExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile AddExactLNonConstantTest.java Verify.java
  * @run main AddExactLNonConstantTest
--- a/test/compiler/intrinsics/mathexact/DecExactITest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/DecExactITest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test decrementExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile DecExactITest.java Verify.java
  * @run main DecExactITest
--- a/test/compiler/intrinsics/mathexact/DecExactLTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/DecExactLTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test decrementExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile DecExactLTest.java Verify.java
  * @run main DecExactLTest
--- a/test/compiler/intrinsics/mathexact/IncExactITest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/IncExactITest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test incrementExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile IncExactITest.java Verify.java
  * @run main IncExactITest
--- a/test/compiler/intrinsics/mathexact/IncExactLTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/IncExactLTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test incrementExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile IncExactLTest.java Verify.java
  * @run main IncExactLTest
--- a/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant multiplyExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactIConstantTest.java Verify.java
  * @run main MulExactIConstantTest
--- a/test/compiler/intrinsics/mathexact/MulExactILoadTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactILoadTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test multiplyExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactILoadTest.java Verify.java
  * @run main MulExactILoadTest
--- a/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test loop dependent multiplyExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactILoopDependentTest.java Verify.java
  * @run main MulExactILoopDependentTest
--- a/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant multiplyExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactINonConstantTest.java Verify.java
  * @run main MulExactINonConstantTest
--- a/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test repeating multiplyExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactIRepeatTest.java Verify.java
  * @run main MulExactIRepeatTest
--- a/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant mulExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactLConstantTest.java Verify.java
  * @run main MulExactLConstantTest
--- a/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant mulExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile MulExactLNonConstantTest.java Verify.java
  * @run main MulExactLNonConstantTest
--- a/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant negExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile NegExactIConstantTest.java Verify.java
  * @run main NegExactIConstantTest
--- a/test/compiler/intrinsics/mathexact/NegExactILoadTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/NegExactILoadTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test negExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile NegExactILoadTest.java Verify.java
  * @run main NegExactILoadTest
--- a/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test negExact loop dependent
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile NegExactILoopDependentTest.java Verify.java
  * @run main NegExactILoopDependentTest
--- a/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant negExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile NegExactINonConstantTest.java Verify.java
  * @run main NegExactINonConstantTest
--- a/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant negExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile NegExactLConstantTest.java Verify.java
  * @run main NegExactLConstantTest
--- a/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant negExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile NegExactLNonConstantTest.java Verify.java
  * @run main NegExactLNonConstantTest
--- a/test/compiler/intrinsics/mathexact/SubExactICondTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactICondTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test subtractExact as condition
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactICondTest.java Verify.java
  * @run main SubExactICondTest
--- a/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test constant subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactIConstantTest.java Verify.java
  * @run main SubExactIConstantTest
--- a/test/compiler/intrinsics/mathexact/SubExactILoadTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactILoadTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactILoadTest.java Verify.java
  * @run main SubExactILoadTest
--- a/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactILoopDependentTest.java Verify.java
  * @run main SubExactILoopDependentTest
--- a/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test non constant subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactINonConstantTest.java Verify.java
  * @run main SubExactINonConstantTest
--- a/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026844
  * @summary Test repeating subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactIRepeatTest.java Verify.java
  * @run main SubExactIRepeatTest
--- a/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8027353
  * @summary Test constant subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactLConstantTest.java Verify.java
  * @run main SubExactLConstantTest
--- a/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8027353
  * @summary Test non constant subtractExact
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile SubExactLNonConstantTest.java Verify.java
  * @run main SubExactLNonConstantTest
--- a/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AddExactIntTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AddExactLongTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build DecrementExactIntTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build DecrementExactLongTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build IncrementExactIntTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build IncrementExactLongTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MultiplyExactIntTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MultiplyExactLongTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build NegateExactIntTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build NegateExactLongTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build SubtractExactIntTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build SubtractExactLongTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA1Intrinsics option processing on supported CPU,
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA1IntrinsicsOptionOnSupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU,
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA256Intrinsics option processing on supported CPU,
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA256IntrinsicsOptionOnSupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU,
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA512Intrinsics option processing on supported CPU.
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA512IntrinsicsOptionOnSupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU,
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA option processing on supported CPU,
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHAOptionOnSupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify UseSHA option processing on unsupported CPU.
  * @library /testlibrary /test/lib /compiler/testlibrary testcases
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHAOptionOnUnsupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8035968
  * @summary Verify that SHA-1 intrinsic is actually used.
  * @library /testlibrary /test/lib /compiler/testlibrary ../
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA1Intrinsics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8035968
  * @summary Verify that SHA-1 multi block intrinsic is actually used.
  * @library /testlibrary /test/lib /compiler/testlibrary ../
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA1MultiBlockIntrinsics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8035968
  * @summary Verify that SHA-256 intrinsic is actually used.
  * @library /testlibrary /test/lib /compiler/testlibrary ../
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA256Intrinsics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8035968
  * @summary Verify that SHA-256 multi block intrinsic is actually used.
  * @library /testlibrary /test/lib /compiler/testlibrary ../
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA256MultiBlockIntrinsics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8035968
  * @summary Verify that SHA-512 intrinsic is actually used.
  * @library /testlibrary /test/lib /compiler/testlibrary ../
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA512Intrinsics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8035968
  * @summary Verify that SHA-512 multi block intrinsic is actually used.
  * @library /testlibrary /test/lib /compiler/testlibrary ../
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA512MultiBlockIntrinsics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 6653795
  * @summary C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main UnsafeGetAddressTest
  *
  */
--- a/test/compiler/jsr292/ConcurrentClassLoadingTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/jsr292/ConcurrentClassLoadingTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8022595
  * @summary JSR292: deadlock during class loading of MethodHandles, MethodHandleImpl & MethodHandleNatives
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm ConcurrentClassLoadingTest
  */
--- a/test/compiler/jsr292/VMAnonymousClasses.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/jsr292/VMAnonymousClasses.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8058828
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  * @run main/bootclasspath -Xbatch VMAnonymousClasses
  */
 
--- a/test/compiler/oracle/CheckCompileCommandOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/oracle/CheckCompileCommandOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @bug 8055286 8056964 8059847 8069035
  * @summary "Checks parsing of -XX:CompileCommand=option"
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CheckCompileCommandOption
  */
--- a/test/compiler/oracle/TestCompileCommand.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/oracle/TestCompileCommand.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @bug 8069389
  * @summary "Regression tests of -XX:CompileCommand"
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestCompileCommand
  */
--- a/test/compiler/profiling/spectrapredefineclass/Launcher.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/profiling/spectrapredefineclass/Launcher.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @test
  * @bug 8038636
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.instrument
  *          java.management
  * @build Agent
--- a/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @test
  * @bug 8040237
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.instrument
  *          java.management
  * @build Agent Test A B
--- a/test/compiler/rangechecks/TestRangeCheckSmearing.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rangechecks/TestRangeCheckSmearing.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8066103
  * @summary C2's range check smearing allows out of bound array accesses
  * @library /testlibrary /test/lib /compiler/whitebox /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRangeCheckSmearing
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
  *          rtm support and on VM with rtm locking support,
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify PrintPreciseRTMLockingStatistics on CPUs without
  *          rtm support and/or unsupported VM.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify RTMAbortRatio option processing on CPU with rtm
  *          support and on VM with rtm locking support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortRatioOptionOnSupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify RTMAbortRatio option processing on CPU without rtm
  *          support or on VM that does not support rtm locking.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortRatioOptionOnUnsupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of RTMAbortThreshold option.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortThresholdOption
  * @run main/othervm TestRTMAbortThresholdOption
--- a/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of RTMLockingCalculationDelay option.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMLockingCalculationDelayOption
  * @run main/othervm TestRTMLockingCalculationDelayOption
--- a/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of RTMLockingThreshold option.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMLockingThresholdOption
  * @run main/othervm TestRTMLockingThresholdOption
--- a/test/compiler/rtm/cli/TestRTMRetryCountOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMRetryCountOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of RTMRetryCount option.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMRetryCountOption
  * @run main/othervm TestRTMRetryCountOption
--- a/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of RTMSpinLoopCount option.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMSpinLoopCountOption
  * @run main/othervm TestRTMSpinLoopCountOption
--- a/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify RTMTotalCountIncrRate option processing on CPU with
  *          rtm support and on VM with rtm locking support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMTotalCountIncrRateOptionOnSupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @summary Verify RTMTotalCountIncrRate option processing on CPU without
  *          rtm support and/or on VM without rtm locking support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMDeopt option processing on CPUs with rtm support
  *          when rtm locking is supported by VM.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMDeoptOptionOnSupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMDeopt option processing on CPUs without rtm support
  *          or on VMs without rtm locking support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMDeoptOptionOnUnsupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMForStackLocks option processing on CPU with
  *          rtm support when VM supports rtm locking.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForStackLocksOptionOnSupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMForStackLocks option processing on CPUs without
  *          rtm support and/or on VMs without rtm locking support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForStackLocksOptionOnUnsupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMLocking option processing on CPU with rtm support and
  *          on VM with rtm-locking support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnSupportedConfig
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMLocking option processing on CPU without
  *          rtm support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnUnsupportedCPU
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify UseRTMLocking option processing on CPU with rtm support
  *          in case when VM should not support this option.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnUnsupportedVM
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify processing of UseRTMLocking and UseBiasedLocking
  *          options combination on CPU and VM with rtm support.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionWithBiasedLocking
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of UseRTMXendForLockBusy option.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMXendForLockBusyOption
  * @run main/othervm TestUseRTMXendForLockBusyOption
--- a/test/compiler/rtm/locking/TestRTMAbortRatio.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMAbortRatio.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that RTMAbortRatio affects amount of aborts before
  *          deoptimization.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortRatio
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMAbortThreshold.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMAbortThreshold.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that RTMAbortThreshold option affects
  *          amount of aborts after which abort ratio is calculated.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortThreshold
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  *          method's RTM state. And if we don't use RTMDeopt, then
  *          RTM state remain the same after such deoptimization.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAfterNonRTMDeopt
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that on high abort ratio method will be recompiled
  *          without rtm locking.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMDeoptOnHighAbortRatio
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that on low abort ratio method will be recompiled.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMDeoptOnLowAbortRatio
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that RTMLockingCalculationDelay affect when
  *          abort ratio calculation is started.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMLockingCalculationDelay
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMLockingThreshold.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMLockingThreshold.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that RTMLockingThreshold affects rtm state transition
  *          ProfileRTM => UseRTM.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMLockingThreshold
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMRetryCount.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMRetryCount.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMRetryCount affects actual amount of retries.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMRetryCount
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMSpinLoopCount.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMSpinLoopCount.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that RTMSpinLoopCount affects time spent
  *          between locking attempts.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMSpinLoopCount
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that RTMTotalCountIncrRate option affects
  *          RTM locking statistics.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMTotalCountIncrRate
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that rtm locking is used for stack locks before
  *          inflation and after it used for inflated locks.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMAfterLockInflation
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestUseRTMDeopt.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestUseRTMDeopt.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that UseRTMDeopt affects uncommon trap installation in
  *          copmpiled methods with synchronized block.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMDeopt
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that rtm locking is used for inflated locks.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForInflatedLocks
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestUseRTMForStackLocks.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestUseRTMForStackLocks.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that rtm locking is used for stack locks.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForStackLocks
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that UseRTMXendForLockBusy option affects
  *          method behaviour if lock is busy.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMXendForLockBusy
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Verify that NoRTMLockEliding option could be applied to
  *          specified method and that such method will not use rtm.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestNoRTMLockElidingOption
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  *          specified method and that such method will not be deoptimized
  *          on high abort ratio.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockElidingOption
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  *          different types. Test also verify that VM output does not
  *          contain rtm locking statistics when it should not.
  * @library /testlibrary /test/lib /compiler/testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatistics
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/runtime/8010927/Test8010927.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/runtime/8010927/Test8010927.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8010927
  * @summary Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy
  * @library /test/lib /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @build Test8010927
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/startup/NumCompilerThreadsCheck.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/startup/NumCompilerThreadsCheck.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8034775
  * @summary Ensures correct minimal number of compiler threads (provided by -XX:CICompilerCount=)
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/startup/SmallCodeCacheStartup.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/startup/SmallCodeCacheStartup.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  *          to initialize all compiler threads. The option -Xcomp gives the VM more time to
  *          trigger the old bug.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/startup/StartupOutput.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/startup/StartupOutput.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8026949
  * @summary Test ensures correct VM output during startup
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 import jdk.test.lib.*;
--- a/test/compiler/tiered/ConstantGettersTransitionsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/tiered/ConstantGettersTransitionsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
 /**
  * @test ConstantGettersTransitionsTest
  * @library /testlibrary /test/lib /compiler/whitebox /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TransitionsTestExecutor ConstantGettersTransitionsTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/tiered/LevelTransitionTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/tiered/LevelTransitionTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
 /**
  * @test LevelTransitionTest
  * @library /testlibrary /test/lib /compiler/whitebox /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8067651
  * @build TransitionsTestExecutor LevelTransitionTest
--- a/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8141551
  * @summary C2 can not handle returns with inccompatible interface arrays
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/types/correctness/CorrectnessTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/types/correctness/CorrectnessTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test CorrectnessTest
  * @bug 8038418
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8066173
  * @compile execution/TypeConflict.java execution/TypeProfile.java
--- a/test/compiler/types/correctness/OffTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/types/correctness/OffTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test CorrectnessTest
  * @bug 8038418
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8066173
  * @compile execution/TypeConflict.java execution/TypeProfile.java
--- a/test/compiler/uncommontrap/TestUnstableIfTrap.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/uncommontrap/TestUnstableIfTrap.java	Sat Apr 09 23:03:39 2016 +0100
@@ -42,7 +42,7 @@
  * @bug 8030976 8059226
  * @library /testlibrary /compiler/testlibrary /test/lib
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/GetUnsafeObjectG1PreBarrier.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8016474
  * @summary The bug only happens with C1 and G1 using a different ObjectAlignmentInBytes than KlassAlignmentInBytes (which is 8)
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=32 GetUnsafeObjectG1PreBarrier
  */
 
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java	Sat Apr 09 23:03:39 2016 +0100
@@ -148,3 +148,4 @@
 
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java	Sat Apr 09 23:03:39 2016 +0100
@@ -185,3 +185,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java	Sat Apr 09 23:03:39 2016 +0100
@@ -203,3 +203,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java	Sat Apr 09 23:03:39 2016 +0100
@@ -185,3 +185,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java	Sat Apr 09 23:03:39 2016 +0100
@@ -185,3 +185,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java	Sat Apr 09 23:03:39 2016 +0100
@@ -300,3 +300,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java	Sat Apr 09 23:03:39 2016 +0100
@@ -300,3 +300,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java	Sat Apr 09 23:03:39 2016 +0100
@@ -236,3 +236,4 @@
 
 }
 
+
--- a/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java	Sat Apr 09 23:03:39 2016 +0100
@@ -203,3 +203,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestBoolean.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for boolean
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestBoolean
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestBoolean
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestBoolean
@@ -131,7 +131,9 @@
 
 
 
+
     }
 
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for byte
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestByte
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestByte
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestByte
@@ -160,6 +160,7 @@
 
 
 
+
     }
 
     static void testAccess(long address) {
@@ -172,3 +173,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for char
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestChar
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestChar
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestChar
@@ -160,6 +160,7 @@
 
 
 
+
     }
 
     static void testAccess(long address) {
@@ -172,3 +173,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestDouble.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for double
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestDouble
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestDouble
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestDouble
@@ -160,6 +160,7 @@
 
 
 
+
     }
 
     static void testAccess(long address) {
@@ -172,3 +173,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestFloat.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for float
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestFloat
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestFloat
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestFloat
@@ -160,6 +160,7 @@
 
 
 
+
     }
 
     static void testAccess(long address) {
@@ -172,3 +173,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for int
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestInt
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestInt
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestInt
@@ -165,6 +165,7 @@
 
 
 
+
         UNSAFE.putInt(base, offset, 1);
 
         // Compare
@@ -183,6 +184,7 @@
         }
 
 
+
         // Compare set and get
         {
             int o = UNSAFE.getAndSetInt(base, offset, 1);
@@ -212,3 +214,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for long
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestLong
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestLong
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestLong
@@ -165,6 +165,7 @@
 
 
 
+
         UNSAFE.putLong(base, offset, 1L);
 
         // Compare
@@ -183,6 +184,7 @@
         }
 
 
+
         // Compare set and get
         {
             long o = UNSAFE.getAndSetLong(base, offset, 1L);
@@ -212,3 +214,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestObject.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestObject.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for Object
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestObject
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestObject
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestObject
@@ -136,6 +136,7 @@
 
 
 
+
         UNSAFE.putObject(base, offset, "foo");
 
         // Compare
@@ -154,6 +155,7 @@
         }
 
 
+
         // Compare set and get
         {
             Object o = UNSAFE.getAndSetObject(base, offset, "foo");
@@ -166,3 +168,4 @@
 
 }
 
+
--- a/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for short
- * @modules java.base/sun.misc
+ * @modules jdk.unsupported/sun.misc
  * @run testng/othervm -Diters=100   -Xint                   SunMiscUnsafeAccessTestShort
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 SunMiscUnsafeAccessTestShort
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  SunMiscUnsafeAccessTestShort
@@ -160,6 +160,7 @@
 
 
 
+
     }
 
     static void testAccess(long address) {
@@ -172,3 +173,4 @@
     }
 }
 
+
--- a/test/compiler/unsafe/UnsafeRaw.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/UnsafeRaw.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8058744
  * @summary Invalid pattern-matching of address computations in raw unsafe
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -Xbatch UnsafeRaw
  */
--- a/test/compiler/unsafe/X-UnsafeAccessTest.java.template	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/X-UnsafeAccessTest.java.template	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143628
  * @summary Test unsafe access for $type$
- * @modules java.base/$package$
+ * @modules $module$/$package$
  * @run testng/othervm -Diters=100   -Xint                   $Qualifier$UnsafeAccessTest$Type$
  * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 $Qualifier$UnsafeAccessTest$Type$
  * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  $Qualifier$UnsafeAccessTest$Type$
--- a/test/compiler/unsafe/generate-unsafe-access-tests.sh	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/unsafe/generate-unsafe-access-tests.sh	Sat Apr 09 23:03:39 2016 +0100
@@ -30,9 +30,11 @@
 # Generates unsafe access tests for objects and all primitive types
 # $1 = package name to Unsafe, sun.misc | jdk.internal.misc
 # $2 = test class qualifier name, SunMisc | JdkInternalMisc
+# $3 = module name containing the Unsafe class, for @modules
 function generate {
     package=$1
     Qualifier=$2
+    module=$3
 
     for type in boolean byte short char int long float double Object
     do
@@ -108,12 +110,12 @@
       args="$args -Dvalue1=$value1 -Dvalue2=$value2 -Dvalue3=$value3"
 
       echo $args
-      java $SPP -nel -K$Qualifier -Dpackage=$package -DQualifier=$Qualifier \
+      java $SPP -nel -K$Qualifier -Dpackage=$package -DQualifier=$Qualifier -Dmodule=$module \
           $args < X-UnsafeAccessTest.java.template > ${Qualifier}UnsafeAccessTest${Type}.java
     done
 }
 
-generate sun.misc SunMisc
-generate jdk.internal.misc JdkInternalMisc
+generate sun.misc SunMisc jdk.unsupported
+generate jdk.internal.misc JdkInternalMisc java.base
 
-rm -fr build
\ No newline at end of file
+rm -fr build
--- a/test/compiler/whitebox/IsMethodCompilableTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/compiler/whitebox/IsMethodCompilableTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test IsMethodCompilableTest
  * @bug 8007270 8006683 8007288 8022832
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build IsMethodCompilableTest
--- a/test/gc/TestCardTablePageCommits.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/TestCardTablePageCommits.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @summary Tests that the card table does not commit the same page twice
  * @requires vm.gc=="Parallel" | vm.gc=="null"
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestCardTablePageCommits
  */
--- a/test/gc/TestObjectAlignment.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/TestObjectAlignment.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8021823
  * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=8
  * @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=16
--- a/test/gc/TestSoftReferencesBehaviorOnOOME.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/TestSoftReferencesBehaviorOnOOME.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @summary Tests that all SoftReferences has been cleared at time of OOM.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSoftReferencesBehaviorOnOOME
  * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 512 2k
--- a/test/gc/TestVerifyDuringStartup.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/TestVerifyDuringStartup.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8010463 8011343 8011898
  * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/TestVerifySilently.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/TestVerifySilently.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8032771
  * @summary Test silent verification.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/TestVerifySubSet.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/TestVerifySubSet.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8072725
  * @summary Test VerifySubSet option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/arguments/TestArrayAllocatorMallocLimit.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestArrayAllocatorMallocLimit.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8054823
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestArrayAllocatorMallocLimit
  */
--- a/test/gc/arguments/TestCMSHeapSizeFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestCMSHeapSizeFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestCompressedClassFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestCompressedClassFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @summary Tests that VM prints a warning when -XX:CompressedClassSpaceSize
  *          is used together with -XX:-UseCompressedClassPointers
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 public class TestCompressedClassFlags {
--- a/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @requires vm.gc=="null" | vm.gc=="G1"
  * @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/arguments/TestG1ConcRefinementThreads.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestG1ConcRefinementThreads.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Tests argument processing for G1ConcRefinementThreads
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/arguments/TestG1HeapSizeFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestG1HeapSizeFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestG1HeapSizeFlags TestMaxHeapSizeTools
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestG1PercentageOptions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestG1PercentageOptions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @summary Test argument processing of various percentage options
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestG1PercentageOptions
  */
--- a/test/gc/arguments/TestHeapFreeRatio.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestHeapFreeRatio.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8025661
  * @summary Test parsing of -Xminf and -Xmaxf
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm TestHeapFreeRatio
  */
--- a/test/gc/arguments/TestInitialTenuringThreshold.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestInitialTenuringThreshold.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="Parallel" | vm.gc=="null"
  * @summary Tests argument processing for initial tenuring threshold
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm TestInitialTenuringThreshold
  * @author thomas.schatzl@oracle.com
--- a/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @summary Verify that heap size changes according to max and min heap free ratios.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestMaxMinHeapFreeRatioFlags
  * @run driver/timeout=240 TestMaxMinHeapFreeRatioFlags
--- a/test/gc/arguments/TestMaxNewSize.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestMaxNewSize.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestMaxNewSize
  * @run main TestMaxNewSize -XX:+UseSerialGC
--- a/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @summary Verify that MinSurvivorRatio and InitialSurvivorRatio flags work
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestMinAndInitialSurvivorRatioFlags
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestMinInitialErgonomics.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestMinInitialErgonomics.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8006088
  * @summary Test ergonomics decisions related to minimum and initial heap size.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestMinInitialErgonomics TestMaxHeapSizeTools
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestNewRatioFlag.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestNewRatioFlag.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8025166
  * @summary Verify that heap devided among generations according to NewRatio
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestNewRatioFlag
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestNewSizeFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestNewSizeFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8025166
  * @summary Verify that young gen size conforms values specified by NewSize, MaxNewSize and Xmn options
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestNewSizeFlags
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestNewSizeThreadIncrease.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestNewSizeThreadIncrease.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Tests argument processing for NewSizeThreadIncrease
  * @library /testlibrary
  * @requires vm.gc=="Serial" | vm.gc=="null"
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/arguments/TestObjectTenuringFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestObjectTenuringFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @summary Tests argument processing for NeverTenure, AlwaysTenure,
  * and MaxTenuringThreshold
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestObjectTenuringFlags FlagsValue
  * @run main/othervm TestObjectTenuringFlags
--- a/test/gc/arguments/TestParallelGCThreads.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestParallelGCThreads.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8059527 8081382
  * @summary Tests argument processing for ParallelGCThreads
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestParallelGCThreads
  */
--- a/test/gc/arguments/TestParallelHeapSizeFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestParallelHeapSizeFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * parallel collectors.
  * @requires vm.gc=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestParallelHeapSizeFlags TestMaxHeapSizeTools
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestSelectDefaultGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestSelectDefaultGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8068582
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8148239
  * @run driver TestSelectDefaultGC
--- a/test/gc/arguments/TestSerialHeapSizeFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestSerialHeapSizeFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the Serial collector
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSerialHeapSizeFlags TestMaxHeapSizeTools
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -34,7 +34,7 @@
  *           & vm.opt.UnlockExperimentalVMOptions == null
  *           & (vm.opt.IgnoreUnrecognizedVMOptions == null
  *              | vm.opt.IgnoreUnrecognizedVMOptions == "false")
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestSurvivorAlignmentInBytesOption
  */
--- a/test/gc/arguments/TestSurvivorRatioFlag.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestSurvivorRatioFlag.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @summary Verify that actual survivor ratio is equal to specified SurvivorRatio value
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestSurvivorRatioFlag
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestTargetSurvivorRatioFlag.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestTargetSurvivorRatioFlag.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestTargetSurvivorRatioFlag
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8017611
  * @summary Tests handling unrecognized VM options
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm TestUnrecognizedVMOptionsHandling
  */
--- a/test/gc/arguments/TestUseCompressedOopsErgo.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestUseCompressedOopsErgo.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestUseNUMAInterleaving.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/arguments/TestUseNUMAInterleaving.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 8059614
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestUseNUMAInterleaving
  */
--- a/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8049831
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestCMSClassUnloadingEnabledHWM
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8049831
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestG1ClassUnloadingHWM
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/cms/GuardShrinkWarning.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/cms/GuardShrinkWarning.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @key gc
  * @key regression
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm GuardShrinkWarning
  * @author jon.masamitsu@oracle.com
--- a/test/gc/g1/Test2GbHeap.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/Test2GbHeap.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @key gc
  * @key regression
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestEagerReclaimHumongousRegions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestEagerReclaimHumongousRegions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC.
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * mark bitmaps at reclaim.
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * should still be eagerly reclaimable to avoid Full GC.
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * includes the expected necessary messages.
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestGCLogMessages.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestGCLogMessages.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * includes the expected necessary messages.
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestHumongousAllocInitialMark.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestHumongousAllocInitialMark.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 7168848
  * @summary G1: humongous object allocations should initiate marking cycles when necessary
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestHumongousCodeCacheRoots.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestHumongousCodeCacheRoots.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @key gc
  * @bug 8027756
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestHumongousCodeCacheRoots
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @key gc
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @build TestNoEagerReclaimOfHumongousRegions
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/gc/g1/TestPLABSizeBounds.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestPLABSizeBounds.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestPrintRegionRememberedSetInfo.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestPrintRegionRememberedSetInfo.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8014240
  * @summary Test output of G1PrintRegionRememberedSetInfo
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestPrintRegionRememberedSetInfo
  * @author thomas.schatzl@oracle.com
--- a/test/gc/g1/TestRemsetLogging.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestRemsetLogging.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @requires vm.gc=="G1" | vm.gc =="null"
  * @bug 8013895 8129977 8145534
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build TestRemsetLoggingTools TestRemsetLogging
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/g1/TestRemsetLoggingPerRegion.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestRemsetLoggingPerRegion.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @requires vm.gc=="G1" | vm.gc =="null"
  * @bug 8014078 8129977 8145534
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build TestRemsetLoggingTools TestRemsetLoggingPerRegion
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/g1/TestRemsetLoggingThreads.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestRemsetLoggingThreads.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8025441 8145534
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @summary Ensure that various values of worker threads/concurrent
  * refinement threads do not crash the VM.
--- a/test/gc/g1/TestShrinkAuxiliaryData00.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData00.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  *        TestShrinkAuxiliaryData TestShrinkAuxiliaryData00
--- a/test/gc/g1/TestShrinkAuxiliaryData05.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData05.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  *        TestShrinkAuxiliaryData TestShrinkAuxiliaryData05
--- a/test/gc/g1/TestShrinkAuxiliaryData10.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData10.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10
--- a/test/gc/g1/TestShrinkAuxiliaryData15.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData15.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15
--- a/test/gc/g1/TestShrinkAuxiliaryData20.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData20.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
   *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20
--- a/test/gc/g1/TestShrinkAuxiliaryData25.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData25.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25
--- a/test/gc/g1/TestShrinkAuxiliaryData30.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkAuxiliaryData30.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30
--- a/test/gc/g1/TestShrinkDefragmentedHeap.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestShrinkDefragmentedHeap.java	Sat Apr 09 23:03:39 2016 +0100
@@ -32,7 +32,7 @@
  *     3. invoke gc and check that memory returned to the system (amount of committed memory got down)
  *
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  */
 import java.lang.management.ManagementFactory;
--- a/test/gc/g1/TestStringDeduplicationAgeThreshold.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationAgeThreshold.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringDeduplicationFullGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationFullGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringDeduplicationInterned.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationInterned.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringDeduplicationPrintOptions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationPrintOptions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringDeduplicationTableRehash.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationTableRehash.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringDeduplicationTableResize.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationTableResize.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringDeduplicationYoungGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringDeduplicationYoungGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8029075
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/g1/TestStringSymbolTableStats.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/g1/TestStringSymbolTableStats.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Ensure that the G1TraceStringSymbolTableScrubbing prints the expected message.
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/logging/TestDeprecatedPrintFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/logging/TestDeprecatedPrintFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify PrintGC, PrintGCDetails and -Xloggc
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/logging/TestGCId.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/logging/TestGCId.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @requires vm.gc=="null"
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/logging/TestPrintReferences.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/logging/TestPrintReferences.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Validate the reference processing logging
  * @key gc
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8004924
  * @summary Checks that jmap -heap contains the flag CompressedClassSpaceSize
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:CompressedClassSpaceSize=50m CompressedClassSpaceSizeInJmapHeap
  */
--- a/test/gc/metaspace/TestCapacityUntilGCWrapAround.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/metaspace/TestCapacityUntilGCWrapAround.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8049831
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestCapacityUntilGCWrapAround
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/metaspace/TestMetaspaceMemoryPool.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/metaspace/TestMetaspaceMemoryPool.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @summary Tests that a MemoryPoolMXBeans is created for metaspace and that a
  *          MemoryManagerMXBean is created.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops TestMetaspaceMemoryPool
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:MaxMetaspaceSize=60m TestMetaspaceMemoryPool
--- a/test/gc/metaspace/TestMetaspacePerfCounters.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/metaspace/TestMetaspacePerfCounters.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @library /testlibrary
  * @summary Tests that performance counters for metaspace and compressed class
  *          space exists and works.
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/gc/metaspace/TestMetaspaceSizeFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/metaspace/TestMetaspaceSizeFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @bug 8024650
  * @summary Test that metaspace size flags can be set correctly
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 public class TestMetaspaceSizeFlags {
--- a/test/gc/metaspace/TestPerfCountersAndMemoryPools.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/metaspace/TestPerfCountersAndMemoryPools.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @requires vm.gc=="Serial" | vm.gc=="null"
  * @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace
  *          report the same data.
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
  * @ignore 8151460
--- a/test/gc/parallel/AdaptiveGCBoundary.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/parallel/AdaptiveGCBoundary.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @key gc
  * @key regression
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm AdaptiveGCBoundary
  * @author jon.masamitsu@oracle.com
--- a/test/gc/serial/HeapChangeLogging.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/serial/HeapChangeLogging.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test HeapChangeLogging.java
  * @bug 8027440
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build HeapChangeLogging
  * @summary Allocate to get a promotion failure and verify that that heap change logging is present.
--- a/test/gc/startup_warnings/TestCMS.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestCMS.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8006398
 * @summary Test that CMS does not print a warning message
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestDefNewCMS.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestDefNewCMS.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8065972
 * @summary Test that the unsupported DefNew+CMS combination does not start
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestG1.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestG1.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8006398
 * @summary Test that the G1 collector does not print a warning message
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestParNewCMS.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestParNewCMS.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8065972
 * @summary Test that specifying -XX:+UseParNewGC on the command line logs a warning message
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestParNewSerialOld.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestParNewSerialOld.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8065972
 * @summary Test that the unsupported ParNew+SerialOld combination does not start
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestParallelGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestParallelGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8006398
 * @summary Test that ParallelGC does not print a warning message
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestParallelScavengeSerialOld.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestParallelScavengeSerialOld.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8006398
 * @summary Test that the ParallelScavenge+SerialOld combination does not print a warning message
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/startup_warnings/TestSerialGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/startup_warnings/TestSerialGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
 * @bug 8006398
 * @summary Test that SerialGC does not print a warning message
 * @library /testlibrary
-* @modules java.base/sun.misc
+* @modules java.base/jdk.internal.misc
 *          java.management
 */
 
--- a/test/gc/survivorAlignment/TestAllocationInEden.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/survivorAlignment/TestAllocationInEden.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify that object's alignment in eden space is not affected by
  *          SurvivorAlignmentInBytes option.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestAllocationInEden SurvivorAlignmentTestMain AlignmentHelper
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify that objects promoted from eden space to tenured space during
  *          full GC are not aligned to SurvivorAlignmentInBytes value.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPromotionFromEdenToTenured SurvivorAlignmentTestMain
  *        AlignmentHelper
--- a/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify that objects promoted from survivor space to tenured space
  *          during full GC are not aligned to SurvivorAlignmentInBytes value.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPromotionFromSurvivorToTenuredAfterFullGC
  *        SurvivorAlignmentTestMain AlignmentHelper
--- a/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  *          when their age exceeded tenuring threshold are not aligned to
  *          SurvivorAlignmentInBytes value.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPromotionFromSurvivorToTenuredAfterMinorGC
  *        SurvivorAlignmentTestMain AlignmentHelper
--- a/test/gc/survivorAlignment/TestPromotionToSurvivor.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/survivorAlignment/TestPromotionToSurvivor.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Verify that objects promoted from eden space to survivor space after
  *          minor GC are aligned to SurvivorAlignmentInBytes.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPromotionToSurvivor
  *        SurvivorAlignmentTestMain AlignmentHelper
--- a/test/gc/whitebox/TestConcMarkCycleWB.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/whitebox/TestConcMarkCycleWB.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8065579
  * @requires vm.gc=="null" | vm.gc=="G1"
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/gc/whitebox/TestWBGC.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/gc/whitebox/TestWBGC.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8055098
  * @summary Test verify that WB methods isObjectInOldGen and youngGC works correctly.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestWBGC
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/8003720/Test8003720.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/8003720/Test8003720.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8003720
  * @summary Method in interpreter stack frame can be deallocated
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  * @compile -XDignore.symbol.file Victim.java
  * @run main/othervm -Xverify:all -Xint Test8003720
  */
--- a/test/runtime/8026365/InvokeSpecialAnonTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/8026365/InvokeSpecialAnonTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @author  Robert Field
  * @library /testlibrary
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  * @compile -XDignore.symbol.file InvokeSpecialAnonTest.java
  * @run main ClassFileInstaller InvokeSpecialAnonTest AnonTester
  * @run main/othervm -Xbootclasspath/a:. -Xverify:all InvokeSpecialAnonTest
--- a/test/runtime/BadObjectClass/BootstrapRedefine.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/BadObjectClass/BootstrapRedefine.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 6583051
  * @summary Give error if java.lang.Object has been incompatibly overridden on the bootpath
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main BootstrapRedefine
  */
--- a/test/runtime/BootClassAppendProp/BootClassPathAppend.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/BootClassAppendProp/BootClassPathAppend.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8087154
  * @summary Uninitialized system property jdk.boot.class.path.append causes SIGSEGV
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  */
 
 import jdk.test.lib.*;
--- a/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8003424
  * @summary Testing UseCompressedClassPointers with CDS
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CDSCompressedKPtrs
  */
--- a/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8003424
  * @summary Test that cannot use CDS if UseCompressedClassPointers is turned off.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CDSCompressedKPtrsError
  */
--- a/test/runtime/CDSCompressedKPtrs/XShareAuto.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CDSCompressedKPtrs/XShareAuto.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8005933
  * @summary Test that -Xshare:auto uses CDS when explicitly specified with -server.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main XShareAuto
  */
--- a/test/runtime/ClassFile/JsrRewriting.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/ClassFile/JsrRewriting.java	Sat Apr 09 23:03:39 2016 +0100
@@ -34,7 +34,7 @@
  * @bug 7149464
  * @key cte_test
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.desktop
  *          java.management
  * @run main JsrRewriting
--- a/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java	Sat Apr 09 23:03:39 2016 +0100
@@ -34,7 +34,7 @@
  * @bug 7123945
  * @bug 8016029
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.desktop
  *          java.management
  * @run main OomWhileParsingRepeatedJsr
--- a/test/runtime/ClassFile/UnsupportedClassFileVersion.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/ClassFile/UnsupportedClassFileVersion.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @library /testlibrary
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  *          java.management
  * @compile -XDignore.symbol.file UnsupportedClassFileVersion.java
  * @run main UnsupportedClassFileVersion
--- a/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8006298
  * @summary Setting an invalid value for a bool argument should result in a useful error message
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/CompilerConfigFileWarning.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/CompilerConfigFileWarning.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 7167142
  * @summary Warn if unused .hotspot_compiler file is present
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/ConfigFileParsing.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/ConfigFileParsing.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 7158804
  * @summary Improve config file parsing
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/ConfigFileWarning.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/ConfigFileWarning.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 7167142
  * @summary Warn if unused .hotspot_rc file is present
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/FlagWithInvalidValue.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/FlagWithInvalidValue.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8006298
  * @summary Setting a flag to an invalid value should print a useful error message
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @summary -XX:+IgnoreUnrecognizedVMOptions should work according to the spec from JDK-8129855
  *
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main IgnoreUnrecognizedVMOptions
  */
--- a/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8006298
  * @summary Using a bool (+/-) prefix on non-bool flag should result in a useful error message
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  *          value which is not allowed by constraint. Also check that
  *          jcmd does not print an error message to the target process output.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.management
  * @run main TestJcmdOutput
--- a/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test VM Options with ranges
  * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test writeable VM Options with ranges.
  * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          jdk.attach/sun.tools.attach
  *          java.management
  * @run main/othervm -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 TestOptionsWithRangesDynamic
--- a/test/runtime/CommandLine/PrintTouchedMethods.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/PrintTouchedMethods.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8025692
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @library /testlibrary
  * @compile TestLogTouchedMethods.java PrintTouchedMethods.java
--- a/test/runtime/CommandLine/TestHexArguments.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/TestHexArguments.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Make sure there is no error using hexadecimal format in vm options
  * @author Yumin Qi
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/TestNullTerminatedFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/TestNullTerminatedFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @bug 6522873
  * @summary Test that the VM don't allow random junk characters at the end of valid command line flags.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestNullTerminatedFlags
  */
--- a/test/runtime/CommandLine/TestVMOptions.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/TestVMOptions.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8060256
  * @summary Test various command line options
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestVMOptions
  */
--- a/test/runtime/CommandLine/TraceExceptionsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/TraceExceptionsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8048933
  * @summary TraceExceptions output should have the exception message - useful for ClassNotFoundExceptions especially
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/UnrecognizedVMOption.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/UnrecognizedVMOption.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8006298
  * @summary Using an unrecognized VM option should print the name of the option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CommandLine/VMOptionWarning.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CommandLine/VMOptionWarning.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8027314
  * @summary Warn if diagnostic or experimental vm option is used and -XX:+UnlockDiagnosticVMOptions or -XX:+UnlockExperimentalVMOptions, respectively, isn't specified. Warn if develop or notproduct vm option is used with product version of VM.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CompressedOops/CompressedClassPointers.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CompressedOops/CompressedClassPointers.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8024927
  * @summary Testing address of compressed class pointer space as best as possible.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CompressedOops/CompressedClassSpaceSize.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CompressedOops/CompressedClassSpaceSize.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8022865
  * @summary Tests for the -XX:CompressedClassSpaceSize command line option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CompressedClassSpaceSize
  */
--- a/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @key regression
  * @summary NPG: UseCompressedClassPointers asserts with ObjectAlignmentInBytes=32
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/CompressedOops/ObjectAlignment.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CompressedOops/ObjectAlignment.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8022865
  * @summary Tests for the -XX:ObjectAlignmentInBytes command line option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main ObjectAlignment
  */
--- a/test/runtime/CompressedOops/UseCompressedOops.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/CompressedOops/UseCompressedOops.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Tests for different combination of UseCompressedOops options
  * @library /testlibrary
  * @ignore 8079353
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main UseCompressedOops
  */
--- a/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8044738
  * @library /testlibrary
  * @summary Check attribute_length of EnclosingMethod attribute
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main EnclMethodAttr
  */
--- a/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/runtime/ErrorHandling/ProblematicFrameTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/ErrorHandling/ProblematicFrameTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8050167
  * @summary Test that error is not occurred during printing problematic frame
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/runtime/ErrorHandling/SecondaryErrorTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/ErrorHandling/SecondaryErrorTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  * @summary Synchronous signals during error reporting may terminate or hang VM process
  * @library /testlibrary
  * @author Thomas Stuefe (SAP)
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/LoadClass/LoadClassNegative.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/LoadClass/LoadClassNegative.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8020675
  * @summary make sure there is no fatal error if a class is loaded from an invalid jar file which is in the bootclasspath
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestForName
  * @build LoadClassNegative
--- a/test/runtime/LocalVariableTable/TestLVT.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/LocalVariableTable/TestLVT.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8049632
  * @summary Test ClassFileParser::copy_localvariable_table cases
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile -g -XDignore.symbol.file TestLVT.java
  * @run main TestLVT
--- a/test/runtime/NMT/AutoshutdownNMT.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/AutoshutdownNMT.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Test for deprecated message if -XX:-AutoShutdownNMT is specified
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/BaselineWithParameter.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/BaselineWithParameter.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @key nmt jcmd regression
  * @summary Regression test for invoking a jcmd with baseline=false, result was that the target VM crashed
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:NativeMemoryTracking=detail BaselineWithParameter
  */
--- a/test/runtime/NMT/CommandLineDetail.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/CommandLineDetail.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Running with NMT detail should not result in an error
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/CommandLineEmptyArgument.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/CommandLineEmptyArgument.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Empty argument to NMT should result in an informative error message
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/CommandLineInvalidArgument.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/CommandLineInvalidArgument.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Invalid argument to NMT should result in an informative error message
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/CommandLineSummary.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/CommandLineSummary.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Running with NMT summary should not result in an error
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/CommandLineTurnOffNMT.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/CommandLineTurnOffNMT.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Turning off NMT should not result in an error
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/JcmdBaselineDetail.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/JcmdBaselineDetail.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Verify that jcmd correctly reports that baseline succeeds with NMT enabled with detailed tracking.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:NativeMemoryTracking=detail JcmdBaselineDetail
  */
--- a/test/runtime/NMT/JcmdDetailDiff.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/JcmdDetailDiff.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary run NMT baseline, allocate memory and verify output from detail.diff
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build JcmdDetailDiff
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/JcmdScale.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/JcmdScale.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Test the NMT scale parameter
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:NativeMemoryTracking=summary JcmdScale
  */
--- a/test/runtime/NMT/JcmdScaleDetail.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/JcmdScaleDetail.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Test the NMT scale parameter with detail tracking level
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:NativeMemoryTracking=detail JcmdScaleDetail
  */
--- a/test/runtime/NMT/JcmdSummaryDiff.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/JcmdSummaryDiff.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary run NMT baseline, allocate memory and verify output from summary.diff
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build JcmdSummaryDiff
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/JcmdWithNMTDisabled.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/JcmdWithNMTDisabled.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Verify that jcmd correctly reports that NMT is not enabled
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main JcmdWithNMTDisabled 1
  */
--- a/test/runtime/NMT/MallocRoundingReportTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/MallocRoundingReportTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Test consistency of NMT by creating allocations of the Test type with various sizes and verifying visibility with jcmd
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MallocRoundingReportTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/MallocStressTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/MallocStressTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Stress test for malloc tracking
  * @key nmt jcmd stress
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MallocStressTest
  * @ignore - This test is disabled since it will stress NMT and timeout during normal testing
--- a/test/runtime/NMT/MallocTestType.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/MallocTestType.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Test consistency of NMT by leaking a few select allocations of the Test type and then verify visibility with jcmd
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MallocTestType
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/MallocTrackingVerify.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/MallocTrackingVerify.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @summary Test to verify correctness of malloc tracking
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MallocTrackingVerify
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/NMTWithCDS.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/NMTWithCDS.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8055061
  * @key nmt
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main NMTWithCDS
  */
--- a/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt
  * @summary Trying to enable PrintNMTStatistics should result in a warning
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/NMT/ReleaseNoCommit.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/ReleaseNoCommit.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Release uncommitted memory and make sure NMT handles it correctly
  * @key nmt regression
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ReleaseNoCommit
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/ShutdownTwice.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/ShutdownTwice.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Run shutdown twice
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice
  */
--- a/test/runtime/NMT/SummaryAfterShutdown.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/SummaryAfterShutdown.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Verify that jcmd correctly reports that NMT is not enabled after a shutdown
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:NativeMemoryTracking=detail SummaryAfterShutdown
  */
--- a/test/runtime/NMT/SummarySanityCheck.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/SummarySanityCheck.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @key nmt jcmd
  * @summary Sanity check the output of NMT
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build SummarySanityCheck
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/ThreadedMallocTestType.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/ThreadedMallocTestType.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ThreadedMallocTestType
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ThreadedVirtualAllocTestType
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Test reserve/commit/uncommit/release of virtual memory and that we track it correctly
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build VirtualAllocCommitUncommitRecommit
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/NMT/VirtualAllocTestType.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/NMT/VirtualAllocTestType.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly
  * @key nmt jcmd
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build VirtualAllocTestType
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/PerfMemDestroy/PerfMemDestroy.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/PerfMemDestroy/PerfMemDestroy.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8030955
  * @summary Allow multiple calls to PerfMemory::destroy() without asserting.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main PerfMemDestroy
  */
--- a/test/runtime/RedefineObject/TestRedefineObject.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/RedefineObject/TestRedefineObject.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @bug 8005056
  * @bug 8009728
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.instrument
  *          java.management
  * @build Agent
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8047290
  * @summary Ensure that a Monitor::lock_without_safepoint_check fires an assert when it incorrectly acquires a lock which must always have safepoint checks.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AssertSafepointCheckConsistency1
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8047290
  * @summary Ensure that a Monitor::lock fires an assert when it incorrectly acquires a lock which must never have safepoint checks.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AssertSafepointCheckConsistency2
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8047290
  * @summary Ensure that Monitor::lock_without_safepoint_check does not assert when it correctly acquires a lock which must never have safepoint checks.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AssertSafepointCheckConsistency3
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8047290
  * @summary Ensure that Monitor::lock does not assert when it correctly acquires a lock which must always have safepoint checks.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AssertSafepointCheckConsistency4
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  *          when sharing mode is ON, and continue w/o sharing if sharing
  *          mode is AUTO.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main ArchiveDoesNotExist
  */
--- a/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary CDS (class data sharing) requires the same -XX:[+-]CompactStrings
  *          setting between archive creation time and load time.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  *          should fail when loading.
  * @library /testlibrary
  * @bug 8025642
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Testing CDS (class data sharing) using varying object alignment.
  *          Using same object alignment for each dump/load pair
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test DefaultUseWithClient
  * @summary Test default behavior of sharing with -client
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main DefaultUseWithClient
  * @bug 8032224
--- a/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8059510
  * @summary Test jcmd VM.symboltable and VM.stringtable options
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions DumpSymbolAndStringTable
  */
--- a/test/runtime/SharedArchiveFile/LimitSharedSizes.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/LimitSharedSizes.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /* @test LimitSharedSizes
  * @summary Test handling of limits on shared space size
  * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.attach/sun.tools.attach
  * @run main LimitSharedSizes
--- a/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8067187
  * @summary Testing CDS dumping with the -XX:MaxMetaspaceSize=<size> option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8066670
  * @summary Testing -XX:+PrintSharedArchiveAndExit option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/SharedArchiveFile.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/SharedArchiveFile.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8014138
  * @summary Testing new -XX:SharedArchiveFile=<file-name> option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/SharedBaseAddress.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/SharedBaseAddress.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Test variety of values for SharedBaseAddress, making sure
  *          VM handles normal values as well as edge values w/o a crash.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main SharedBaseAddress
  */
--- a/test/runtime/SharedArchiveFile/SharedStrings.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/SharedStrings.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @requires (vm.gc=="G1" | vm.gc=="null")
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar
  * @build SharedStringsWb SharedStrings BasicJarBuilder sun.hotspot.WhiteBox
--- a/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @requires (vm.gc=="G1" | vm.gc=="null")
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main SharedStringsRunAuto
  */
--- a/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8059510
  * @summary Test SharedSymbolTableBucketSize option
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test SpaceUtilizationCheck
  * @summary Check if the space utilization for shared spaces is adequate
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main SpaceUtilizationCheck
  */
--- a/test/runtime/Thread/TestThreadDumpMonitorContention.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Thread/TestThreadDumpMonitorContention.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  *      whether jstack reports "locked" by more than one thread.
  *
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm TestThreadDumpMonitorContention
  */
--- a/test/runtime/Thread/ThreadPriorities.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Thread/ThreadPriorities.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  *      whether jstack reports correct priorities for them.
  *
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main ThreadPriorities
  */
--- a/test/runtime/Unsafe/AllocateInstance.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/AllocateInstance.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies the behaviour of Unsafe.allocateInstance
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main AllocateInstance
  */
--- a/test/runtime/Unsafe/AllocateMemory.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/AllocateMemory.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @requires vm.compMode != "Xcomp"
  * @summary Verifies behaviour of Unsafe.allocateMemory
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m AllocateMemory
  */
--- a/test/runtime/Unsafe/CopyMemory.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/CopyMemory.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies behaviour of Unsafe.copyMemory
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main CopyMemory
  */
--- a/test/runtime/Unsafe/DefineClass.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/DefineClass.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies the behaviour of Unsafe.defineClass
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  * @run main DefineClass
--- a/test/runtime/Unsafe/FieldOffset.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/FieldOffset.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies the behaviour of Unsafe.fieldOffset
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main FieldOffset
  */
--- a/test/runtime/Unsafe/GetField.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetField.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies behaviour of Unsafe.getField
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetField
  */
--- a/test/runtime/Unsafe/GetKlassPointerGetJavaMirror.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetKlassPointerGetJavaMirror.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8022853
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @build jdk.test.lib.*
  * @run main GetKlassPointerGetJavaMirror
  */
--- a/test/runtime/Unsafe/GetPutAddress.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutAddress.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * Verify behaviour of Unsafe.get/putAddress and Unsafe.addressSize
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutAddress
  */
--- a/test/runtime/Unsafe/GetPutBoolean.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutBoolean.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putBoolean
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutBoolean
  */
--- a/test/runtime/Unsafe/GetPutByte.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutByte.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putByte
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutByte
  */
--- a/test/runtime/Unsafe/GetPutChar.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutChar.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putChar
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutChar
  */
--- a/test/runtime/Unsafe/GetPutDouble.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutDouble.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putDouble
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutDouble
  */
--- a/test/runtime/Unsafe/GetPutFloat.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutFloat.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putFloat
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutFloat
  */
--- a/test/runtime/Unsafe/GetPutInt.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutInt.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutInt
  */
--- a/test/runtime/Unsafe/GetPutLong.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutLong.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putLong
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutLong
  */
--- a/test/runtime/Unsafe/GetPutObject.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutObject.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putObject
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutObject
  */
--- a/test/runtime/Unsafe/GetPutShort.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetPutShort.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify behaviour of Unsafe.get/putShort
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main GetPutShort
  */
--- a/test/runtime/Unsafe/GetUncompressedObject.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetUncompressedObject.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8022853
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @build jdk.test.lib.*
  * @run main GetUncompressedObject
  */
--- a/test/runtime/Unsafe/GetUnsafe.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/GetUnsafe.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies that getUnsafe() actually throws SecurityException when unsafeAccess is prohibited.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main GetUnsafe
  */
 
--- a/test/runtime/Unsafe/PageSize.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/PageSize.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Make sure pageSize() returns a value that is a power of two
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main PageSize
  */
--- a/test/runtime/Unsafe/RangeCheck.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/RangeCheck.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8001071
  * @summary Add simple range check into VM implemenation of Unsafe access methods
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/runtime/Unsafe/Reallocate.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/Reallocate.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @requires vm.compMode != "Xcomp"
  * @bug 8058897
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m Reallocate
  */
--- a/test/runtime/Unsafe/SetMemory.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/SetMemory.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies that setMemory works correctly
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main SetMemory
  */
--- a/test/runtime/Unsafe/ThrowException.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/Unsafe/ThrowException.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify that throwException() can throw an exception
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main ThrowException
  */
--- a/test/runtime/XCheckJniJsig/XCheckJSig.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/XCheckJniJsig/XCheckJSig.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 7051189 8023393
  * @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main XCheckJSig
  */
--- a/test/runtime/classFileParserBug/ClassFileParserBug.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/classFileParserBug/ClassFileParserBug.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8040018
  * @library /testlibrary
  * @summary Check for exception instead of assert.
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main ClassFileParserBug
  */
--- a/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8041918
  * @library /testlibrary
  * @summary Test empty bootstrap_methods table within BootstrapMethods attribute
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile TestEmptyBootstrapMethodsAttr.java
  * @run main TestEmptyBootstrapMethodsAttr
--- a/test/runtime/contended/Options.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/contended/Options.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @summary ContendedPaddingWidth should be range-checked
  *
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main Options
  */
--- a/test/runtime/duplAttributes/DuplAttributesTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/duplAttributes/DuplAttributesTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8040292
  * @library /testlibrary
  * @summary Throw exceptions when duplicate attributes are detected.
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main DuplAttributesTest
  */
--- a/test/runtime/logging/BiasedLockingTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/BiasedLockingTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8149383
  * @summary -Xlog:biasedlocking should have logging from statements in the source code
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver BiasedLockingTest
--- a/test/runtime/logging/DefaultMethodsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/DefaultMethodsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8139564
  * @summary defaultmethods=debug should have logging from each of the statements in the code
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver DefaultMethodsTest
--- a/test/runtime/logging/ExceptionsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/ExceptionsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8141211 8147477
  * @summary exceptions=info output should have an exception message for interpreter methods
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver ExceptionsTest
--- a/test/runtime/logging/ItablesTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/ItablesTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @library /testlibrary
  * @compile ClassB.java
  *          ItablesVtableTest.java
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver ItablesTest
  */
--- a/test/runtime/logging/ModulesTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/ModulesTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary modules=debug should have logging from statements in the code
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run main ModulesTest
--- a/test/runtime/logging/MonitorInflationTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/MonitorInflationTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8133885
  * @summary monitorinflation=debug should have logging from each of the statements in the code
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver MonitorInflationTest
--- a/test/runtime/logging/SafepointTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/SafepointTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8140348
  * @summary safepoint=trace should have output from each log statement in the code
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver SafepointTest
--- a/test/runtime/logging/StartupTimeTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/StartupTimeTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8148630
  * @summary -Xlog:startuptime should produce logging from the source code
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver StartupTimeTest
--- a/test/runtime/logging/ThreadLoggingTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/ThreadLoggingTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8149036 8150619
  * @summary os+thread output should contain logging calls for thread start stop attaches detaches
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver ThreadLoggingTest
--- a/test/runtime/logging/VMOperationTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/VMOperationTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8143157
  * @summary vmoperation=debug should have logging output
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
  * @run driver VMOperationTest
--- a/test/runtime/logging/VtablesTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/logging/VtablesTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  *          p2/B.jcod
  *          p1/C.java
  *          p2/D.java
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver VtablesTest
  */
--- a/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @summary Tests that the flag -XX:LargePageSizeInBytes does not cause warnings on Solaris
  * @bug 8049536
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver TestLargePageSizeInBytes
  */
--- a/test/runtime/memory/LargePages/TestLargePagesFlags.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/memory/LargePages/TestLargePagesFlags.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /* @test TestLargePagesFlags
  * @summary Tests how large pages are choosen depending on the given large pages flag combinations.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestLargePagesFlags
  */
--- a/test/runtime/memory/ReadFromNoaccessArea.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/memory/ReadFromNoaccessArea.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ReadFromNoaccessArea
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/memory/ReserveMemory.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/memory/ReserveMemory.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8012015
  * @summary Make sure reserved (but uncommitted) memory is not accessible
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build ReserveMemory
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/memory/RunUnitTestsConcurrently.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/memory/RunUnitTestsConcurrently.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test launches unit tests inside vm concurrently
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build RunUnitTestsConcurrently
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/runtime/modules/AccModuleTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/modules/AccModuleTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @compile acc_module.jcod
  * @build AccModuleTest
  * @run main AccModuleTest
--- a/test/runtime/modules/Visibility/XbootcpNoVisibility.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/modules/Visibility/XbootcpNoVisibility.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Ensure that a class defined within a java.base package can not
  *          be located via -Xbootclasspath/a
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm XbootcpNoVisibility
  */
--- a/test/runtime/modules/Visibility/XbootcpVisibility.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/modules/Visibility/XbootcpVisibility.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  *          is correctly located with -Xbootclasspath/a
  * @requires !(os.family == "windows")
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm XbootcpVisibility
  */
--- a/test/runtime/modules/Visibility/XpatchVisibility.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/modules/Visibility/XpatchVisibility.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  *          is considered part of the boot loader's visibility boundary
  * @requires !(os.family == "windows")
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm XpatchVisibility
  */
--- a/test/runtime/modules/XpatchCDS.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/modules/XpatchCDS.java	Sat Apr 09 23:03:39 2016 +0100
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @run main XpatchCDS
  */
 
--- a/test/runtime/verifier/OverriderMsg.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/verifier/OverriderMsg.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @bug 8026894
  * @library /testlibrary
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  *          java.management
  * @compile -XDignore.symbol.file OverriderMsg.java
  * @run main/othervm OverriderMsg
--- a/test/runtime/verifier/TestANewArray.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/verifier/TestANewArray.java	Sat Apr 09 23:03:39 2016 +0100
@@ -35,7 +35,7 @@
  * @summary Test that anewarray bytecode is valid only if it specifies 255 or fewer dimensions.
  * @library /testlibrary
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  *          java.management
  * @compile -XDignore.symbol.file TestANewArray.java
  * @run main/othervm TestANewArray 49
--- a/test/runtime/verifier/TestMultiANewArray.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/runtime/verifier/TestMultiANewArray.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @bug 8038076
  * @library /testlibrary
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/sun.misc
+ *          java.base/jdk.internal.misc
  *          java.management
  * @compile -XDignore.symbol.file TestMultiANewArray.java
  * @run main/othervm TestMultiANewArray 49
--- a/test/serviceability/attach/AttachSetGetFlag.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/attach/AttachSetGetFlag.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @bug 8054823
  * @summary Tests the setFlag and printFlag attach command
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.attach/sun.tools.attach
--- a/test/serviceability/dcmd/compiler/CodeCacheTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/compiler/CodeCacheTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test CodeCacheTest
  * @bug 8054889
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/compiler/CodelistTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/compiler/CodelistTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test CodelistTest
  * @bug 8054889
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test CompilerDirectivesDCMDTest
  * @bug 8137167
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  * @build jdk.test.lib.*
--- a/test/serviceability/dcmd/compiler/CompilerQueueTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/compiler/CompilerQueueTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test CompilerQueueTest
  * @bug 8054889
  * @library /testlibrary /test/lib /
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/framework/HelpTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/framework/HelpTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @test
  * @summary Test of diagnostic command help (tests all DCMD executors)
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/framework/InvalidCommandTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/framework/InvalidCommandTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @test
  * @summary Test of invalid diagnostic command (tests all DCMD executors)
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/framework/VMVersionTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/framework/VMVersionTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -34,7 +34,7 @@
  * @test
  * @summary Test of diagnostic command VM.version (tests all DCMD executors)
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/gc/ClassHistogramAllTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/gc/ClassHistogramAllTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test of diagnostic command GC.class_histogram -all=true
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/gc/ClassHistogramTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/gc/ClassHistogramTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @test
  * @summary Test of diagnostic command GC.class_histogram
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/gc/HeapDumpAllTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/gc/HeapDumpAllTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Test of diagnostic command GC.heap_dump -all=true
  * @library /testlibrary
  * @library /test/lib/share/classes
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/gc/HeapDumpTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/gc/HeapDumpTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -42,7 +42,7 @@
  * @summary Test of diagnostic command GC.heap_dump
  * @library /testlibrary
  * @library /test/lib/share/classes
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/gc/RunFinalizationTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/gc/RunFinalizationTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -32,7 +32,7 @@
  * @summary Test of diagnostic command GC.run_finalization
  * @library /testlibrary
  * @library /test/lib/share/classes
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/gc/RunGCTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/gc/RunGCTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -37,7 +37,7 @@
  * @test
  * @summary Test of diagnostic command GC.run
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -36,7 +36,7 @@
  * @test
  * @bug 8147388
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.instrument
  *          java.management
--- a/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test of diagnostic command Thread.print -l=true
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/thread/PrintTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/thread/PrintTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -38,7 +38,7 @@
  * @test
  * @summary Test of diagnostic command Thread.print
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/ClassHierarchyTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/ClassHierarchyTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test of diagnostic command VM.class_hierarchy
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test of diagnostic command VM.classloader_stats
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/CommandLineTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/CommandLineTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @test
  * @summary Test of diagnostic command VM.command_line
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/DynLibsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/DynLibsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @test
  * @summary Test of VM.dynlib diagnostic command via MBean
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/FlagsTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/FlagsTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -30,7 +30,7 @@
  * @test
  * @summary Test of diagnostic command VM.flags
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/SystemPropertiesTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/SystemPropertiesTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -31,7 +31,7 @@
  * @test
  * @summary Test of diagnostic command VM.system_properties
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/dcmd/vm/UptimeTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/dcmd/vm/UptimeTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -35,7 +35,7 @@
  * @test
  * @summary Test of diagnostic command VM.uptime
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/jvmti/GetObjectSizeOverflow.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/jvmti/GetObjectSizeOverflow.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @test
  * @bug 8027230
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.instrument
  *          java.management
--- a/test/serviceability/jvmti/TestLambdaFormRetransformation.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/jvmti/TestLambdaFormRetransformation.java	Sat Apr 09 23:03:39 2016 +0100
@@ -27,7 +27,7 @@
  * @bug 8008678
  * @summary JSR 292: constant pool reconstitution must support pseudo strings
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.instrument
  *          java.management
  *          jdk.jartool/sun.tools.jar
--- a/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java	Sat Apr 09 23:03:39 2016 +0100
@@ -26,7 +26,7 @@
  * @summary Redefine a class with an UnresolvedClass reference in the constant pool.
  * @bug 8035150
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.instrument
  *          java.management
--- a/test/serviceability/logging/TestLogRotation.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/logging/TestLogRotation.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test TestLogRotation.java
  * @summary test flags for log rotation
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main/othervm/timeout=600 TestLogRotation
  *
--- a/test/serviceability/sa/jmap-hashcode/Test8028623.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/sa/jmap-hashcode/Test8028623.java	Sat Apr 09 23:03:39 2016 +0100
@@ -33,7 +33,7 @@
  * @bug 8028623
  * @summary Test hashing of extended characters in Serviceability Agent.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -44,7 +44,7 @@
  * @key regression
  * @summary Regression test for hprof export issue due to large heaps (>2G)
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management/sun.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/stress/gc/TestStressRSetCoarsening.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/stress/gc/TestStressRSetCoarsening.java	Sat Apr 09 23:03:39 2016 +0100
@@ -32,7 +32,7 @@
  * @requires os.maxMemory > 3G
  *
  * @summary Stress G1 Remembered Set by creating a lot of cross region links
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/OutputAnalyzerReportingTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/OutputAnalyzerReportingTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -28,7 +28,7 @@
  *     such as printing additional diagnostic info
  *     (exit code, stdout, stderr, command line, etc.)
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/testlibrary_tests/OutputAnalyzerTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/OutputAnalyzerTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Test the OutputAnalyzer utility class
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
--- a/test/testlibrary_tests/RandomGeneratorTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/RandomGeneratorTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test
  * @summary Verify correctnes of the random generator from Utility.java
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver RandomGeneratorTest SAME_SEED
  * @run driver RandomGeneratorTest NO_SEED
--- a/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java	Sat Apr 09 23:03:39 2016 +0100
@@ -39,7 +39,7 @@
  *          in jdk.test.lib.Platform one and only one predicate
  *          evaluates to true.
  * @library /testlibrary
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @run main TestMutuallyExclusivePlatformPredicates
  */
--- a/test/testlibrary_tests/TestPlatformIsTieredSupported.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/TestPlatformIsTieredSupported.java	Sat Apr 09 23:03:39 2016 +0100
@@ -29,7 +29,7 @@
  * @test
  * @summary Verifies that Platform::isTieredSupported returns correct value.
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPlatformIsTieredSupported
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test BooleanTest
  * @bug 8028756
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management/sun.management
  *          jdk.jvmstat/sun.jvmstat.monitor
--- a/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test SizeTTest
  * @bug 8054823
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build SizeTTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java	Sat Apr 09 23:03:25 2016 +0100
+++ b/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java	Sat Apr 09 23:03:39 2016 +0100
@@ -25,7 +25,7 @@
  * @test UintxTest
  * @bug 8028756
  * @library /testlibrary /test/lib
- * @modules java.base/sun.misc
+ * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @build UintxTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox