changeset 12903:f1317e487661

Merge
author alanb
date Thu, 01 Dec 2016 12:42:24 +0000
parents a96915b95040 8d259ee1a109
children d584bbd65d31
files make/symbols/symbols-unix make/test/JtregNative.gmk src/jdk.vm.ci/share/classes/module-info.java src/share/vm/classfile/moduleEntry.hpp src/share/vm/classfile/modules.cpp src/share/vm/classfile/modules.hpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/oops/instanceKlass.cpp src/share/vm/prims/jni.cpp src/share/vm/prims/jni.h src/share/vm/prims/jniCheck.cpp src/share/vm/prims/jvm.cpp src/share/vm/prims/jvm.h src/share/vm/prims/jvmti.xml src/share/vm/prims/jvmtiEnv.cpp src/share/vm/prims/jvmtiExport.cpp src/share/vm/prims/jvmtiExport.hpp src/share/vm/prims/whitebox.cpp src/share/vm/runtime/arguments.cpp src/share/vm/runtime/javaCalls.hpp test/TEST.ROOT test/compiler/c2/Test7190310_unsafe.java test/compiler/codegen/Test8011901.java test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java test/compiler/intrinsics/unsafe/AllocateUninitializedArray.java test/compiler/intrinsics/unsafe/TestUnsafeUnalignedMismatchedAccesses.java test/compiler/intrinsics/unsafe/UnsafeGetAddressTest.java test/compiler/intrinsics/unsafe/UnsafeTwoCASLong.java test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java test/compiler/jvmci/compilerToVM/GetSymbolTest.java test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java test/compiler/rangechecks/TestExplicitRangeChecks.java test/compiler/runtime/Test8010927.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/JdkInternalMiscUnsafeUnalignedAccess.java test/compiler/unsafe/TestUnsafeLoadControl.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/TestStringDeduplicationTools.java test/gc/g1/TestStringDeduplicationYoungGC.java test/runtime/LocalLong/LocalLongTest.java test/runtime/Throwable/StackTraceLogging.java test/runtime/Throwable/TestThrowable.java test/runtime/Throwable/ThrowableIntrospectionSegfault.java test/runtime/getSysPackage/GetSysPkgTest.java test/runtime/modules/AccessCheck/CheckRead.java test/runtime/modules/AccessCheck/DiffCL_CheckRead.java test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java test/runtime/modules/AccessCheck/DiffCL_Umod.java test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java test/runtime/modules/AccessCheck/ExpQualOther.java test/runtime/modules/AccessCheck/ExpQualToM1.java test/runtime/modules/AccessCheck/ExpUnqual.java test/runtime/modules/AccessCheck/ExportAllUnnamed.java test/runtime/modules/AccessCheck/PkgNotExp.java test/runtime/modules/AccessCheck/Umod.java test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java test/runtime/modules/AccessCheck/UmodUPkg.java test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java test/runtime/modules/AccessCheck/Umod_ExpQualOther.java test/runtime/modules/AccessCheck/Umod_ExpUnqual.java test/runtime/modules/AccessCheck/Umod_PkgNotExp.java test/runtime/modules/IgnoreModulePropertiesTest.java test/runtime/modules/JVMAddModulePackage.java test/runtime/modules/JVMDefineModule.java test/runtime/modules/ModuleHelper.java test/runtime/modules/ModuleStress/ModuleSameCLMain.java test/runtime/modules/getModuleJNI/GetModule.java test/runtime/modules/getModuleJNI/libGetModule.c test/serviceability/attach/AttachWithStalePidFile.java test/serviceability/jdwp/AllModulesCommandTest.java test/serviceability/sa/TestInstanceKlassSize.java test/serviceability/sa/TestInstanceKlassSizeForInterface.java
diffstat 4 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Nov 30 15:17:55 2016 -0500
+++ b/.hgignore	Thu Dec 01 12:42:24 2016 +0000
@@ -8,7 +8,6 @@
 ^src/share/tools/IdealGraphVisualizer/dist/
 ^src/share/tools/IdealGraphVisualizer/nbplatform/
 .igv.log
-^.hgtip
 .DS_Store
 ^\.mx.jvmci/env
 ^\.mx.jvmci/.*\.pyc
--- a/make/gensrc/GensrcJvmti.gmk	Wed Nov 30 15:17:55 2016 -0500
+++ b/make/gensrc/GensrcJvmti.gmk	Thu Dec 01 12:42:24 2016 +0000
@@ -130,8 +130,6 @@
 TARGETS += $(JVMTI_OUTPUTDIR)/jvmtiEnvRecommended.cpp
 
 ################################################################################
-# Disable copy of jvmti.h from hotspot until this has been cleared up. The file
-# is currently being copied from the jdk repository. See JDK-8167078.
 # Copy jvmti.h to include dir
 
 # The file is the same regardless of jvm variant. Only let one do the copy.
--- a/make/lib/CompileLibjsig.gmk	Wed Nov 30 15:17:55 2016 -0500
+++ b/make/lib/CompileLibjsig.gmk	Thu Dec 01 12:42:24 2016 +0000
@@ -129,7 +129,7 @@
         ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
           $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig.diz: \
               $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig$(DEBUG_INFO_SUFFIX)
-			$(CD) $$(@D) && $(ZIP) -q -y $$@ $$(basename $$(@F))$(DEBUG_INFO_SUFFIX)
+			$(CD) $$(@D) && $(ZIPEXE) -q -y $$@ $$(basename $$(@F))$(DEBUG_INFO_SUFFIX)
 
           TARGETS += $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig.diz
         endif
--- a/test/Makefile	Wed Nov 30 15:17:55 2016 -0500
+++ b/test/Makefile	Thu Dec 01 12:42:24 2016 +0000
@@ -50,7 +50,7 @@
 UNAME     = uname
 UNIQ      = uniq
 WC        = wc
-ZIP       = zip
+ZIPEXE    = zip
 
 define NEWLINE
 
@@ -213,7 +213,7 @@
 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)`     \
 	           && $(CD) $(ABS_TEST_OUTPUT_DIR)             \
 	           && $(CHMOD) -R a+r . \
-	           && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
+	           && $(ZIPEXE) -q -r $(ARCHIVE_BUNDLE) . )
 
 # important results files
 SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt")
@@ -327,7 +327,7 @@
   else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1)
     CONCURRENCY := 12
   endif
-else 
+else
   CONCURRENCY := 1
 endif
 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)