changeset 22594:32b6a490a856

Merge
author kvn
date Tue, 05 Nov 2013 17:32:53 -0800
parents 938340719ac2 3dd9732b1703
children aaa6b141196c
files hotspot/src/share/vm/classfile/genericSignatures.cpp hotspot/src/share/vm/classfile/genericSignatures.hpp hotspot/src/share/vm/memory/metablock.cpp hotspot/src/share/vm/memory/metablock.hpp hotspot/test/compiler/8013496/Test8013496.sh hotspot/test/gc/7168848/HumongousAlloc.java hotspot/test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java hotspot/test/runtime/6878713/Test6878713.sh hotspot/test/runtime/6878713/testcase.jar hotspot/test/runtime/7020373/Test7020373.sh hotspot/test/runtime/7020373/testcase.jar hotspot/test/testlibrary/AssertsTest.java hotspot/test/testlibrary/OutputAnalyzerReportingTest.java hotspot/test/testlibrary/OutputAnalyzerTest.java jdk/make/sun/awt/FILES_c_macosx.gmk jdk/make/sun/awt/FILES_export_macosx.gmk jdk/makefiles/CompileJavaClasses.gmk jdk/makefiles/CompileLaunchers.gmk jdk/makefiles/CompileNativeLibraries.gmk jdk/makefiles/GendataBreakIterator.gmk jdk/makefiles/GendataFontConfig.gmk jdk/makefiles/GendataHtml32dtd.gmk jdk/makefiles/GendataTZDB.gmk jdk/makefiles/GendataTimeZone.gmk jdk/makefiles/GenerateJavaSources.gmk jdk/makefiles/GensrcBuffer.gmk jdk/makefiles/GensrcCLDR.gmk jdk/makefiles/GensrcCharacterData.gmk jdk/makefiles/GensrcCharsetCoder.gmk jdk/makefiles/GensrcCharsetMapping.gmk jdk/makefiles/GensrcExceptions.gmk jdk/makefiles/GensrcIcons.gmk jdk/makefiles/GensrcJDWP.gmk jdk/makefiles/GensrcJObjC.gmk jdk/makefiles/GensrcLocaleDataMetaInfo.gmk jdk/makefiles/GensrcMisc.gmk jdk/makefiles/GensrcProperties.gmk jdk/makefiles/GensrcSwing.gmk jdk/makefiles/GensrcX11Wrappers.gmk jdk/makefiles/gendata/GendataFontConfig.gmk jdk/makefiles/gensrc/GensrcX11Wrappers.gmk jdk/makefiles/lib/Awt2dLibraries.gmk jdk/makefiles/lib/CoreLibraries.gmk jdk/makefiles/lib/NetworkingLibraries.gmk jdk/makefiles/lib/NioLibraries.gmk jdk/makefiles/lib/PlatformLibraries.gmk jdk/makefiles/lib/SecurityLibraries.gmk jdk/makefiles/lib/ServiceabilityLibraries.gmk jdk/makefiles/lib/SoundLibraries.gmk jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java jdk/src/macosx/classes/sun/lwawt/SelectionClearListener.java jdk/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m jdk/src/share/classes/com/sun/jdi/connect/package.html jdk/src/share/classes/com/sun/jdi/connect/spi/package.html jdk/src/share/classes/com/sun/jdi/event/package.html jdk/src/share/classes/com/sun/jdi/package.html jdk/src/share/classes/com/sun/jdi/request/package.html jdk/src/share/classes/com/sun/management/package.html jdk/src/share/classes/com/sun/tools/attach/package.html jdk/src/share/classes/com/sun/tools/attach/spi/package.html jdk/src/share/classes/com/sun/tools/jconsole/package.html jdk/src/share/classes/java/lang/invoke/InvokeGeneric.java jdk/src/share/classes/java/lang/invoke/MagicLambdaImpl.java jdk/src/share/classes/java/net/HttpURLPermission.java jdk/src/share/classes/java/time/chrono/ChronoDateImpl.java jdk/src/share/classes/java/util/stream/CloseableStream.java jdk/src/share/classes/java/util/stream/DelegatingStream.java jdk/src/share/demo/jfc/Notepad/resources/Notepad_fr.properties jdk/src/share/demo/jfc/Notepad/resources/Notepad_sv.properties jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 jdk/src/solaris/doc/sun/man/man1/javaws.1 jdk/test/com/oracle/security/ucrypto/TestAES.java jdk/test/com/oracle/security/ucrypto/TestDigest.java jdk/test/com/oracle/security/ucrypto/TestRSA.java jdk/test/com/oracle/security/ucrypto/UcryptoTest.java jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh jdk/test/java/net/HttpURLPermission/HttpURLPermissionTest.java jdk/test/java/net/HttpURLPermission/URLTest.java jdk/test/java/net/HttpURLPermission/policy.1 jdk/test/java/net/HttpURLPermission/policy.2 jdk/test/java/net/HttpURLPermission/policy.3 jdk/test/java/net/NetworkInterface/MemLeakTest.java jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so jdk/test/java/time/tck/java/time/chrono/TCKChronologySerialization.java jdk/test/java/util/Collection/ListDefaults.java jdk/test/java/util/Map/CheckRandomHashSeed.java jdk/test/java/util/Map/TreeBinSplitBackToEntries.java jdk/test/java/util/concurrent/ConcurrentHashMap/toArray.java jdk/test/java/util/regex/PatternTest.java jdk/test/jdk/lambda/vm/DefaultMethodsTest.java jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh jdk/test/sun/tools/jconsole/ImmutableResourceTest.java jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh jdk/test/sun/tools/jstatd/jpsOutput1.awk jdk/test/sun/tools/jstatd/jstatGcutilOutput1.awk jdk/test/sun/tools/jstatd/jstatdDefaults.sh jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh jdk/test/sun/tools/jstatd/jstatdPort.sh jdk/test/sun/tools/jstatd/jstatdServerName.sh jdk/test/sun/tools/jstatd/jstatdUsage1.sh jdk/test/sun/tools/jstatd/usage.out langtools/src/share/classes/com/sun/javadoc/package.html langtools/src/share/classes/com/sun/tools/classfile/package.html langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/package.html langtools/src/share/classes/com/sun/tools/doclets/formats/html/package.html langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package.html langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/package.html langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package.html langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package.html langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/package.html langtools/src/share/classes/com/sun/tools/doclets/package.html langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java langtools/src/share/classes/com/sun/tools/javac/model/JavacAnnoConstructs.java langtools/src/share/classes/com/sun/tools/javap/package.html langtools/src/share/classes/com/sun/tools/jdeps/Profiles.java langtools/src/share/classes/jdk/Supported.java langtools/test/tools/javac/ExtDirs/ext1/pkg1.jar langtools/test/tools/javac/ExtDirs/ext2/pkg2.jar langtools/test/tools/javac/ExtDirs/ext3/pkg1.jar langtools/test/tools/javac/ExtDirs/ext3/pkg2.jar langtools/test/tools/javac/T8019486/WrongLVTForLambdaTest.java langtools/test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateStaticClass.out langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.java langtools/test/tools/javac/annotations/typeAnnotations/failures/IncompleteVararg.out langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.java langtools/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out langtools/test/tools/javac/diags/examples/CantAnnotateNestedType.java langtools/test/tools/javac/diags/examples/CantAnnotateStaticClass.java langtools/test/tools/javac/diags/examples/CyclicInference.java langtools/test/tools/javac/diags/examples/DuplicateAnnotation.java langtools/test/tools/javac/diags/examples/MrefStat.java.rej langtools/test/tools/javac/diags/examples/MrefStat1.java.rej langtools/test/tools/javac/generics/OverrideBridge.java langtools/test/tools/javac/lambda/TargetType10.out langtools/test/tools/javac/lambda/typeInference/InferenceTest5.java langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg5.java langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg5.out nashorn/make/java.security.override nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectMirrorIterator.java nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectMirrorIterator.java
diffstat 5151 files changed, 182583 insertions(+), 86898 deletions(-) [+]