changeset 25716:fc9bd7814b10

Merge
author coleenp
date Mon, 14 Jul 2014 10:15:21 -0400
parents d5a8dbdc5150 ff281ea14d41
children 7493b8ac31b7
files hotspot/src/os/aix/vm/os_aix.cpp hotspot/src/os/solaris/vm/os_solaris.cpp hotspot/src/os/windows/vm/os_windows.cpp hotspot/src/share/vm/c1/c1_GraphBuilder.cpp hotspot/src/share/vm/c1/c1_Runtime1.cpp hotspot/src/share/vm/code/compiledIC.hpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp hotspot/src/share/vm/interpreter/interpreterRuntime.cpp hotspot/src/share/vm/opto/compile.cpp hotspot/src/share/vm/opto/output.cpp hotspot/src/share/vm/prims/jniCheck.cpp hotspot/src/share/vm/prims/jvm.cpp hotspot/src/share/vm/prims/jvmtiTagMap.cpp hotspot/src/share/vm/prims/whitebox.cpp hotspot/src/share/vm/runtime/safepoint.cpp hotspot/src/share/vm/runtime/sharedRuntime.cpp hotspot/src/share/vm/runtime/thread.cpp jdk/make/mapfiles/libnpt/mapfile-vers jdk/make/src/classes/build/tools/tzdb/ChronoField.java jdk/make/src/classes/build/tools/tzdb/DateTimeException.java jdk/make/src/classes/build/tools/tzdb/LocalDate.java jdk/make/src/classes/build/tools/tzdb/LocalDateTime.java jdk/make/src/classes/build/tools/tzdb/LocalTime.java jdk/make/src/classes/build/tools/tzdb/TimeDefinition.java jdk/make/src/classes/build/tools/tzdb/Utils.java jdk/make/src/classes/build/tools/tzdb/ZoneOffset.java jdk/make/src/classes/build/tools/tzdb/ZoneOffsetTransition.java jdk/make/src/classes/build/tools/tzdb/ZoneOffsetTransitionRule.java jdk/make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java jdk/src/macosx/native/com/apple/laf/ScreenPopupFactory.m jdk/src/macosx/native/jobjc/JObjC.xcodeproj/default.pbxuser jdk/src/macosx/native/jobjc/JObjC.xcodeproj/project.pbxproj jdk/src/macosx/native/jobjc/README.txt jdk/src/macosx/native/jobjc/TODOS jdk/src/macosx/native/jobjc/bridgesupport.gmk jdk/src/macosx/native/jobjc/build.xml jdk/src/macosx/native/jobjc/extract_classes.pl jdk/src/macosx/native/jobjc/run-and-write-if-okay jdk/src/macosx/native/jobjc/rungen jdk/src/macosx/native/jobjc/runjava jdk/src/macosx/native/jobjc/src/core/PrimitiveCoder.hs jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CFType.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CIF.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/FFIType.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Function.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/ID.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Invoke.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/JObjCRuntime.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/MacOSXFramework.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NSClass.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeArgumentBuffer.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeBuffer.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeObjectLifecycleManager.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Opaque.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Pointer.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/PrimitiveCoder.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/SEL.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Struct.java jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Subclassing.java jdk/src/macosx/native/jobjc/src/core/native/CIF.m jdk/src/macosx/native/jobjc/src/core/native/Coder.m jdk/src/macosx/native/jobjc/src/core/native/FFIType.m jdk/src/macosx/native/jobjc/src/core/native/Function.m jdk/src/macosx/native/jobjc/src/core/native/ID.m jdk/src/macosx/native/jobjc/src/core/native/Invoke.m jdk/src/macosx/native/jobjc/src/core/native/JObjCRuntime.m jdk/src/macosx/native/jobjc/src/core/native/MacOSXFramework.m jdk/src/macosx/native/jobjc/src/core/native/NSClass.m jdk/src/macosx/native/jobjc/src/core/native/NativeBuffer.h jdk/src/macosx/native/jobjc/src/core/native/NativeBuffer.m jdk/src/macosx/native/jobjc/src/core/native/NativeObjectLifecycleManager.m jdk/src/macosx/native/jobjc/src/core/native/SEL.m jdk/src/macosx/native/jobjc/src/core/native/Subclassing.m jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/BootClassPathMinus.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/ClassConsolidator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/ClassGenerator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/FileCopier.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/FrameworkGenerator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/FunctionGenerator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/Generator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/MethodDisambiguator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/RestrictedKeywords.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/Utils.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/AbstractObjCClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CFTypeClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CategoryClassClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CategoryClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CopiedFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/FrameworkClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/GeneratedClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/JObjCClassClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/JObjCClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/MixedPrimitiveCoderClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/OpaqueClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/OutputFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/RootJObjCClass.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/StructClassFile.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Arg.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/CFType.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Category.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Clazz.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Constant.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Element.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/ElementWType.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Framework.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Function.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/FunctionAlias.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/InformalProtocol.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Method.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/NativeEnum.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Opaque.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/OutputFileGenerator.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Protocol.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/ReturnValue.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/StringConstant.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Struct.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/TypeElement.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/CoderDescriptor.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/ComplexCoderDescriptor.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/PrimitiveCoderDescriptor.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/JType.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/NType.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/Type.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/TypeCache.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/TypeToJType.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/Fp.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/JavaLang.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/NTypeMerger.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/NTypeParser.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/NTypePrinter.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/ObjectInspector.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/QA.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StringStream.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StructOffsetResolver.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StructOffsetResolverBigBang.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/jobjc/SuperClassExtractor.java jdk/src/macosx/native/jobjc/src/generator/java/com/apple/jobjc/UnsafeRuntimeAccess.java jdk/src/macosx/native/jobjc/src/runtime-additions/java/com/apple/jobjc/Utils.java jdk/src/macosx/native/jobjc/src/runtime-additions/native/NativeNumber.m jdk/src/macosx/native/jobjc/src/runtime-additions/native/NativeString.m jdk/src/macosx/native/jobjc/src/runtime-additions/native/NativeThread.m jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BaseBench.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchFunCall.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchIDPop.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchStructCoding.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchUnsafe.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/CategoryTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/FunctionTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/GUIDemo.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/IBDemo.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/IntroTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/NSClassTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/NativeBufferTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/NativeTypeTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/PooledTestCase.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/SELTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/StructTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/SubclassingTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/TestUtils.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/UtilsTest.java jdk/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/VarArgsTest.java jdk/src/macosx/native/jobjc/src/tests/native/FunCallBench.m jdk/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java jdk/src/share/classes/com/sun/java/browser/dom/DOMAccessor.java jdk/src/share/classes/com/sun/java/browser/dom/DOMAction.java jdk/src/share/classes/com/sun/java/browser/dom/DOMService.java jdk/src/share/classes/com/sun/java/browser/dom/DOMServiceProvider.java jdk/src/share/classes/com/sun/java/browser/dom/DOMUnsupportedException.java jdk/src/share/classes/com/sun/java/browser/net/ProxyInfo.java jdk/src/share/classes/com/sun/java/browser/net/ProxyService.java jdk/src/share/classes/com/sun/java/browser/net/ProxyServiceProvider.java jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider jdk/src/share/classes/sun/awt/EventQueueDelegate.java jdk/src/share/classes/sun/jvmstat/monitor/remote/BufferedMonitoredVm.java jdk/src/share/classes/sun/management/manifest jdk/src/share/classes/sun/misc/Timeable.java jdk/src/share/classes/sun/misc/Timer.java jdk/src/share/classes/sun/text/CodePointIterator.java jdk/src/share/lib/security/BlacklistedCertsConverter.java jdk/src/share/lib/security/blacklisted.certs jdk/src/share/lib/security/blacklisted.certs.pem jdk/src/share/npt/README.txt jdk/src/share/npt/npt.c jdk/src/share/npt/npt.h jdk/src/share/npt/utf.c jdk/src/share/npt/utf.h jdk/src/solaris/npt/npt_md.h jdk/src/solaris/npt/utf_md.c jdk/src/solaris/npt/utf_md.h jdk/src/windows/npt/npt_md.h jdk/src/windows/npt/utf_md.c jdk/src/windows/npt/utf_md.h jdk/test/com/sun/jdi/ProcessAttachDebuggee.java jdk/test/com/sun/jdi/ProcessAttachDebugger.java jdk/test/com/sun/jdi/ProcessAttachTest.sh jdk/test/com/sun/jdi/ShutdownDebuggee.java jdk/test/com/sun/jdi/SuspendNoFlagTest.sh jdk/test/com/sun/tools/attach/Shutdown.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/AbsoluteComponentCenterCalculator.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/DataFlavorSearcher.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MyTransferable.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/NextFramePositionCalculator.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/SourcePanel.java jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/TargetPanel.java jdk/test/java/awt/EventQueue/6638195/bug6638195.java jdk/test/java/awt/datatransfer/DuplicatedNativesTest/DuplicatedNativesTest.java jdk/test/java/awt/datatransfer/MappingGenerationTest/MappingGenerationTest.java jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh jdk/test/sun/jvmstat/testlibrary/JavaProcess.java jdk/test/sun/security/pkcs11/nss/src/MD5SUMS jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz jdk/test/sun/tools/jhat/HatRun.java langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java langtools/test/com/sun/javadoc/testHref/pkg/C3.java langtools/test/com/sun/javadoc/testOrdering/pkg1/ZZTop.java langtools/test/tools/javac/completion/C.java langtools/test/tools/javac/completion/C.out langtools/test/tools/javac/completion/example/B.class langtools/test/tools/javac/diags/examples/AnnotationsNotSupported.java langtools/test/tools/javac/diags/examples/AssertAsIdentifier.java langtools/test/tools/javac/diags/examples/EnumAsIdentifier.java langtools/test/tools/javac/diags/examples/EnumsNotSupported.java langtools/test/tools/javac/diags/examples/ForeachNotSupported.java langtools/test/tools/javac/diags/examples/GenericsNotSupported.java langtools/test/tools/javac/diags/examples/StaticImportNotSupported.java langtools/test/tools/javac/diags/examples/UnsupportedFpLit.java langtools/test/tools/javac/diags/examples/VarargsNotSupported.java langtools/test/tools/javac/enum/T5081785a.java langtools/test/tools/javac/enum/T5081785b.java langtools/test/tools/javac/enum/T5081785c.java langtools/test/tools/javac/expression/_super/NonDirectSuper/Base.java langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java langtools/test/tools/javac/expression/_super/NonDirectSuper/Target11.java langtools/test/tools/javac/miranda/6964669/T6964669.java langtools/test/tools/javac/miranda/6964669/pkg/A.java langtools/test/tools/javac/miranda/6964669/pkg/B.java langtools/test/tools/javac/miranda/6964669/pkg/C.java langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java langtools/test/tools/javac/mixedTarget/CompatibleAbstracts2.java langtools/test/tools/javac/varargs/6313164/T6313164.out langtools/test/tools/javac/versions/CheckClassFileVersion.java langtools/test/tools/javac/versions/check.sh nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
diffstat 3045 files changed, 71872 insertions(+), 50273 deletions(-) [+]