changeset 29181:89beae49867c

Merge
author kvn
date Thu, 11 Dec 2014 15:06:12 -0800
parents 50369728b00e 6494b13f88a8
children 78af2a4d1ec3
files corba/make/CommonCorba.gmk corba/make/CompileCorba.gmk corba/make/GensrcCorba.gmk hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/OneContigSpaceCardGeneration.java hotspot/make/linux/makefiles/gcc.make hotspot/make/solaris/makefiles/add_gnu_debuglink.make hotspot/make/solaris/makefiles/fix_empty_sec_hdr_flags.make hotspot/src/os/linux/vm/os_linux.cpp hotspot/src/os/solaris/add_gnu_debuglink/add_gnu_debuglink.c hotspot/src/os/solaris/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c hotspot/src/share/vm/memory/generation.inline.hpp hotspot/src/share/vm/memory/metaspace.cpp hotspot/src/share/vm/opto/c2_globals.hpp hotspot/src/share/vm/opto/graphKit.cpp hotspot/src/share/vm/opto/memnode.hpp hotspot/src/share/vm/prims/methodHandles.hpp hotspot/src/share/vm/runtime/arguments.cpp hotspot/src/share/vm/runtime/atomic.inline.hpp hotspot/src/share/vm/runtime/globals.hpp hotspot/src/share/vm/runtime/os.hpp hotspot/src/share/vm/runtime/stubRoutines.hpp hotspot/src/share/vm/runtime/thread.hpp hotspot/src/share/vm/runtime/vmStructs.cpp hotspot/test/compiler/5057225/Test5057225.java hotspot/test/compiler/5091921/Test5091921.java hotspot/test/compiler/5091921/Test6186134.java hotspot/test/compiler/5091921/Test6196102.java hotspot/test/compiler/5091921/Test6357214.java hotspot/test/compiler/5091921/Test6559156.java hotspot/test/compiler/5091921/Test6753639.java hotspot/test/compiler/5091921/Test6850611.java hotspot/test/compiler/5091921/Test6890943.java hotspot/test/compiler/5091921/Test6897150.java hotspot/test/compiler/5091921/Test6905845.java hotspot/test/compiler/5091921/Test6931567.java hotspot/test/compiler/5091921/Test6935022.java hotspot/test/compiler/5091921/Test6959129.java hotspot/test/compiler/5091921/Test6985295.java hotspot/test/compiler/5091921/Test6992759.java hotspot/test/compiler/5091921/Test7005594.java hotspot/test/compiler/5091921/Test7005594.sh hotspot/test/compiler/5091921/Test7020614.java hotspot/test/compiler/5091921/input6890943.txt hotspot/test/compiler/5091921/output6890943.txt hotspot/test/compiler/6340864/TestByteVect.java hotspot/test/compiler/6340864/TestDoubleVect.java hotspot/test/compiler/6340864/TestFloatVect.java hotspot/test/compiler/6340864/TestIntVect.java hotspot/test/compiler/6340864/TestLongVect.java hotspot/test/compiler/6340864/TestShortVect.java hotspot/test/compiler/6378821/Test6378821.java hotspot/test/compiler/6431242/Test.java hotspot/test/compiler/6443505/Test6443505.java hotspot/test/compiler/6478991/NullCheckTest.java hotspot/test/compiler/6539464/Test.java hotspot/test/compiler/6579789/Test6579789.java hotspot/test/compiler/6589834/InlinedArrayCloneTestCase.java hotspot/test/compiler/6589834/Test_ia32.java hotspot/test/compiler/6603011/Test.java hotspot/test/compiler/6636138/Test1.java hotspot/test/compiler/6636138/Test2.java hotspot/test/compiler/6646019/Test.java hotspot/test/compiler/6646020/Tester.java hotspot/test/compiler/6659207/Test.java hotspot/test/compiler/6661247/Test.java hotspot/test/compiler/6663621/IVTest.java hotspot/test/compiler/6663848/Tester.java hotspot/test/compiler/6663854/Test6663854.java hotspot/test/compiler/6689060/Test.java hotspot/test/compiler/6695810/Test.java hotspot/test/compiler/6700047/Test6700047.java hotspot/test/compiler/6711100/Test.java hotspot/test/compiler/6711117/Test.java hotspot/test/compiler/6712835/Test6712835.java hotspot/test/compiler/6714694/Tester.java hotspot/test/compiler/6716441/Tester.java hotspot/test/compiler/6724218/Test.java hotspot/test/compiler/6726999/Test.java hotspot/test/compiler/6732154/Test6732154.java hotspot/test/compiler/6741738/Tester.java hotspot/test/compiler/6756768/Test6756768.java hotspot/test/compiler/6756768/Test6756768_2.java hotspot/test/compiler/6757316/Test6757316.java hotspot/test/compiler/6758234/Test6758234.java hotspot/test/compiler/6769124/TestArrayCopy6769124.java hotspot/test/compiler/6769124/TestDeoptInt6769124.java hotspot/test/compiler/6769124/TestUnalignedLoad6769124.java hotspot/test/compiler/6772683/InterruptedTest.java hotspot/test/compiler/6775880/Test.java hotspot/test/compiler/6778657/Test.java hotspot/test/compiler/6792161/Test6792161.java hotspot/test/compiler/6795161/Test.java hotspot/test/compiler/6795362/Test6795362.java hotspot/test/compiler/6795465/Test6795465.java hotspot/test/compiler/6796786/Test6796786.java hotspot/test/compiler/6797305/Test6797305.java hotspot/test/compiler/6799693/Test.java hotspot/test/compiler/6800154/Test6800154.java hotspot/test/compiler/6805724/Test6805724.java hotspot/test/compiler/6814842/Test6814842.java hotspot/test/compiler/6823354/Test6823354.java hotspot/test/compiler/6823453/Test.java hotspot/test/compiler/6826736/Test.java hotspot/test/compiler/6832293/Test.java hotspot/test/compiler/6833129/Test.java hotspot/test/compiler/6837011/Test6837011.java hotspot/test/compiler/6837094/Test.java hotspot/test/compiler/6843752/Test.java hotspot/test/compiler/6849574/Test.java hotspot/test/compiler/6851282/Test.java hotspot/test/compiler/6852078/Test6852078.java hotspot/test/compiler/6855164/Test.java hotspot/test/compiler/6855215/Test6855215.java hotspot/test/compiler/6857159/Test6857159.java hotspot/test/compiler/6857159/Test6857159.sh hotspot/test/compiler/6859338/Test6859338.java hotspot/test/compiler/6860469/Test.java hotspot/test/compiler/6863155/Test6863155.java hotspot/test/compiler/6863420/Test.java hotspot/test/compiler/6865031/Test.java hotspot/test/compiler/6865265/StackOverflowBug.java hotspot/test/compiler/6866651/Test.java hotspot/test/compiler/6875866/Test.java hotspot/test/compiler/6877254/Test.java hotspot/test/compiler/6879902/Test6879902.java hotspot/test/compiler/6880034/Test6880034.java hotspot/test/compiler/6885584/Test6885584.java hotspot/test/compiler/6891750/Test6891750.java hotspot/test/compiler/6892265/Test.java hotspot/test/compiler/6894807/IsInstanceTest.java hotspot/test/compiler/6894807/Test6894807.sh hotspot/test/compiler/6895383/Test.java hotspot/test/compiler/6896617/Test6896617.java hotspot/test/compiler/6896727/Test.java hotspot/test/compiler/6901572/Test.java hotspot/test/compiler/6909839/Test6909839.java hotspot/test/compiler/6910484/Test.java hotspot/test/compiler/6910605/Test.java hotspot/test/compiler/6910618/Test.java hotspot/test/compiler/6912517/Test.java hotspot/test/compiler/6916644/Test6916644.java hotspot/test/compiler/6921969/TestMultiplyLongHiZero.java hotspot/test/compiler/6930043/Test6930043.java hotspot/test/compiler/6932496/Test6932496.java hotspot/test/compiler/6934604/TestByteBoxing.java hotspot/test/compiler/6934604/TestDoubleBoxing.java hotspot/test/compiler/6934604/TestFloatBoxing.java hotspot/test/compiler/6934604/TestIntBoxing.java hotspot/test/compiler/6934604/TestLongBoxing.java hotspot/test/compiler/6934604/TestShortBoxing.java hotspot/test/compiler/6935535/Test.java hotspot/test/compiler/6942326/Test.java hotspot/test/compiler/6946040/TestCharShortByteSwap.java hotspot/test/compiler/6956668/Test6956668.java hotspot/test/compiler/6958485/Test.java hotspot/test/compiler/6968348/Test6968348.java hotspot/test/compiler/6973329/Test.java hotspot/test/compiler/6982370/Test6982370.java hotspot/test/compiler/6990212/Test6990212.java hotspot/test/compiler/7002666/Test7002666.java hotspot/test/compiler/7009231/Test7009231.java hotspot/test/compiler/7009359/Test7009359.java hotspot/test/compiler/7017746/Test.java hotspot/test/compiler/7024475/Test7024475.java hotspot/test/compiler/7029152/Test.java hotspot/test/compiler/7041100/Test7041100.java hotspot/test/compiler/7042153/Test7042153.java hotspot/test/compiler/7044738/Test7044738.java hotspot/test/compiler/7046096/Test7046096.java hotspot/test/compiler/7047069/Test7047069.java hotspot/test/compiler/7048332/Test7048332.java hotspot/test/compiler/7052494/Test7052494.java hotspot/test/compiler/7068051/Test7068051.java hotspot/test/compiler/7070134/Stemmer.java hotspot/test/compiler/7070134/Test7070134.sh hotspot/test/compiler/7070134/words hotspot/test/compiler/7082949/Test7082949.java hotspot/test/compiler/7088020/Test7088020.java hotspot/test/compiler/7088419/CRCTest.java hotspot/test/compiler/7090976/Test7090976.java hotspot/test/compiler/7100757/Test7100757.java hotspot/test/compiler/7103261/Test7103261.java hotspot/test/compiler/7110586/Test7110586.java hotspot/test/compiler/7116216/LargeFrame.java hotspot/test/compiler/7116216/StackOverflow.java hotspot/test/compiler/7119644/TestBooleanVect.java hotspot/test/compiler/7119644/TestByteDoubleVect.java hotspot/test/compiler/7119644/TestByteFloatVect.java hotspot/test/compiler/7119644/TestByteIntVect.java hotspot/test/compiler/7119644/TestByteLongVect.java hotspot/test/compiler/7119644/TestByteShortVect.java hotspot/test/compiler/7119644/TestByteVect.java hotspot/test/compiler/7119644/TestCharShortVect.java hotspot/test/compiler/7119644/TestCharVect.java hotspot/test/compiler/7119644/TestDoubleVect.java hotspot/test/compiler/7119644/TestFloatDoubleVect.java hotspot/test/compiler/7119644/TestFloatVect.java hotspot/test/compiler/7119644/TestIntDoubleVect.java hotspot/test/compiler/7119644/TestIntFloatVect.java hotspot/test/compiler/7119644/TestIntLongVect.java hotspot/test/compiler/7119644/TestIntVect.java hotspot/test/compiler/7119644/TestLongDoubleVect.java hotspot/test/compiler/7119644/TestLongFloatVect.java hotspot/test/compiler/7119644/TestLongVect.java hotspot/test/compiler/7119644/TestShortDoubleVect.java hotspot/test/compiler/7119644/TestShortFloatVect.java hotspot/test/compiler/7119644/TestShortIntVect.java hotspot/test/compiler/7119644/TestShortLongVect.java hotspot/test/compiler/7119644/TestShortVect.java hotspot/test/compiler/7123108/Test7123108.java hotspot/test/compiler/7125879/Test7125879.java hotspot/test/compiler/7141637/SpreadNullArg.java hotspot/test/compiler/7160610/Test7160610.java hotspot/test/compiler/7169782/Test7169782.java hotspot/test/compiler/7174363/Test7174363.java hotspot/test/compiler/7177917/Test7177917.java hotspot/test/compiler/7179138/Test7179138_1.java hotspot/test/compiler/7179138/Test7179138_2.java hotspot/test/compiler/7184394/TestAESBase.java hotspot/test/compiler/7184394/TestAESDecode.java hotspot/test/compiler/7184394/TestAESEncode.java hotspot/test/compiler/7184394/TestAESMain.java hotspot/test/compiler/7190310/Test7190310.java hotspot/test/compiler/7190310/Test7190310_unsafe.java hotspot/test/compiler/7192963/TestByteVect.java hotspot/test/compiler/7192963/TestDoubleVect.java hotspot/test/compiler/7192963/TestFloatVect.java hotspot/test/compiler/7192963/TestIntVect.java hotspot/test/compiler/7192963/TestLongVect.java hotspot/test/compiler/7192963/TestShortVect.java hotspot/test/compiler/7196199/Test7196199.java hotspot/test/compiler/7199742/Test7199742.java hotspot/test/compiler/7200264/Test7200264.sh hotspot/test/compiler/7200264/TestIntVect.java hotspot/test/compiler/8000805/Test8000805.java hotspot/test/compiler/8001183/TestCharVect.java hotspot/test/compiler/8002069/Test8002069.java hotspot/test/compiler/8004051/Test8004051.java hotspot/test/compiler/8004741/Test8004741.java hotspot/test/compiler/8004867/TestIntAtomicCAS.java hotspot/test/compiler/8004867/TestIntAtomicOrdered.java hotspot/test/compiler/8004867/TestIntAtomicVolatile.java hotspot/test/compiler/8004867/TestIntUnsafeCAS.java hotspot/test/compiler/8004867/TestIntUnsafeOrdered.java hotspot/test/compiler/8004867/TestIntUnsafeVolatile.java hotspot/test/compiler/8005033/Test8005033.java hotspot/test/compiler/8005419/Test8005419.java hotspot/test/compiler/8005956/PolynomialRoot.java hotspot/test/compiler/8007294/Test8007294.java hotspot/test/compiler/8007722/Test8007722.java hotspot/test/compiler/8009761/Test8009761.java hotspot/test/compiler/8010927/Test8010927.java hotspot/test/compiler/8011706/Test8011706.java hotspot/test/compiler/8011771/Test8011771.java hotspot/test/compiler/8011901/Test8011901.java hotspot/test/compiler/8015436/Test8015436.java hotspot/test/compiler/EliminateAutoBox/UnsignedLoads.java hotspot/test/compiler/EscapeAnalysis/Test8020215.java hotspot/test/compiler/EscapeAnalysis/TestAllocatedEscapesPtrComparison.java hotspot/test/compiler/EscapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java hotspot/test/compiler/IntegerArithmetic/TestIntegerComparison.java hotspot/test/gc/concurrentMarkSweep/CheckAllocateAndSystemGC.java hotspot/test/gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java hotspot/test/gc/startup_warnings/TestCMSForegroundFlags.java jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java jdk/make/Bundles.gmk jdk/make/CreateJars.gmk jdk/make/CreatePolicyJars.gmk jdk/make/CreateSecurityJars.gmk jdk/make/Images.gmk jdk/make/ProfileNames.gmk jdk/make/Profiles.gmk jdk/make/profile-includes.txt jdk/make/profile-rtjar-includes.txt jdk/src/java.base/share/classes/java/util/zip/package.html jdk/src/java.base/share/native/libjli/version_comp.c jdk/src/java.base/share/native/libjli/version_comp.h jdk/src/java.desktop/share/classes/sun/awt/datatransfer/META-INF/services/sun.datatransfer.DesktopDatatransferService jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/Main.java jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/init.js jdk/src/jdk.dev/share/classes/com/sun/tools/script/shell/messages.properties jdk/src/jdk.localedata/META-INF/cldrdata-services/sun.util.locale.provider.LocaleDataMetaInfo jdk/src/jdk.localedata/META-INF/localedata-services/sun.util.locale.provider.LocaleDataMetaInfo jdk/test/javax/crypto/sanity/CheckManifestForRelease.java jdk/test/lib/security/java.policy/Ext_AllPolicy.java jdk/test/lib/security/java.policy/Ext_AllPolicy.sh jdk/test/lib/security/java.policy/test.policy jdk/test/sun/tools/jconsole/ResourceCheckTest.sh jdk/test/sun/tools/jinfo/Basic.sh jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh langtools/make/CommonLangtools.gmk langtools/make/GensrcLangtools.gmk langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/SymbolArchive.java langtools/test/tools/apt/Basics/CheckAptIsRemovedTest.java langtools/test/tools/javac/Paths/CompileClose.java langtools/test/tools/javac/Paths/SameJVM.java langtools/test/tools/javac/annotations/typeAnnotations/classfile/ClassfileInspector.java langtools/test/tools/javac/api/6411310/Test.java langtools/test/tools/javac/diags/examples/UnderscoreAsIdentifier.java langtools/test/tools/javac/lambda/IdentifierTest.out langtools/test/tools/javac/lambda/WarnUnderscoreAsIdent.java langtools/test/tools/javac/lambda/WarnUnderscoreAsIdent.out langtools/test/tools/javac/nio/compileTest/CompileTest.java langtools/test/tools/javac/nio/compileTest/HelloPathWorld.java langtools/test/tools/javac/warnings/Deprecation.lintAll.out langtools/test/tools/javah/compareTest/CompareTest.java langtools/test/tools/javah/compareTest/CompareTest.sh langtools/test/tools/javah/compareTest/FindNativeFiles.java langtools/test/tools/javah/compareTest/README langtools/test/tools/jdeps/profiles.properties nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java
diffstat 2790 files changed, 280668 insertions(+), 188816 deletions(-) [+]