changeset 30544:f74e62472ff3

Merge
author ccheung
date Sat, 02 May 2015 18:35:36 -0700
parents c903c8e5624d f86dca6d2737
children 56cccb06d21c 117bedb6fcf8
files hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp hotspot/src/share/vm/memory/specialized_oop_closures.cpp jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/domapi/package.html jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSS2Properties.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSCharsetRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSFontFaceRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSImportRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSMediaRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPageRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSRuleList.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleDeclaration.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSStyleSheet.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSUnknownRule.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValue.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/CSSValueList.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/Counter.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/DOMImplementationCSS.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/DocumentCSS.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/RGBColor.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/Rect.java jaxp/src/java.xml/share/classes/org/w3c/dom/css/ViewCSS.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAnchorElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAppletElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLAreaElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBRElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLBodyElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLButtonElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLCollection.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDListElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDivElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLDocument.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFontElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFormElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHRElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHeadingElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLHtmlElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIFrameElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLImageElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLInputElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLIElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLabelElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLegendElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLLinkElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMapElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMenuElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLMetaElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLModElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOListElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLObjectElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLOptionElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParagraphElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLParamElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLPreElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLQuoteElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLScriptElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLSelectElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLStyleElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableCellElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableColElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableRowElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTableSectionElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLTitleElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/html/HTMLUListElement.java jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/LinkStyle.java jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/MediaList.java jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheet.java jaxp/src/java.xml/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathEvaluator.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathException.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathExpression.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNSResolver.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathNamespace.java jaxp/src/java.xml/share/classes/org/w3c/dom/xpath/XPathResult.java jdk/make/Makefile jdk/src/java.base/share/classes/sun/security/provider/certpath/ReverseBuilder.java jdk/src/java.base/share/classes/sun/security/provider/certpath/ReverseState.java jdk/src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java jdk/src/java.base/unix/conf/arm/jvm.cfg jdk/src/java.base/unix/conf/ppc/jvm.cfg jdk/test/java/math/RandomSeed.java jdk/test/java/util/Properties/Basic.java jdk/test/jdk/lambda/FDTest.java jdk/test/jdk/lambda/LambdaTranslationInInterface.java jdk/test/jdk/lambda/LambdaTranslationInnerConstructor.java jdk/test/jdk/lambda/MethodReferenceTestFDCCE.java jdk/test/jdk/lambda/MethodReferenceTestInnerDefault.java jdk/test/jdk/lambda/MethodReferenceTestInnerInstance.java jdk/test/jdk/lambda/MethodReferenceTestInnerVarArgsThis.java jdk/test/jdk/lambda/MethodReferenceTestInstance.java jdk/test/jdk/lambda/MethodReferenceTestKinds.java jdk/test/jdk/lambda/MethodReferenceTestNew.java jdk/test/jdk/lambda/MethodReferenceTestNewInner.java jdk/test/jdk/lambda/MethodReferenceTestSueCase1.java jdk/test/jdk/lambda/MethodReferenceTestSueCase2.java jdk/test/jdk/lambda/MethodReferenceTestSueCase4.java jdk/test/jdk/lambda/MethodReferenceTestSuper.java jdk/test/jdk/lambda/MethodReferenceTestSuperDefault.java jdk/test/jdk/lambda/MethodReferenceTestTypeConversion.java jdk/test/jdk/lambda/MethodReferenceTestVarArgs.java jdk/test/jdk/lambda/MethodReferenceTestVarArgsExt.java jdk/test/jdk/lambda/MethodReferenceTestVarArgsSuper.java jdk/test/jdk/lambda/MethodReferenceTestVarArgsSuperDefault.java jdk/test/jdk/lambda/MethodReferenceTestVarArgsThis.java jdk/test/jdk/lambda/shapegen/ClassCase.java jdk/test/jdk/lambda/shapegen/Hierarchy.java jdk/test/jdk/lambda/shapegen/HierarchyGenerator.java jdk/test/jdk/lambda/shapegen/Rule.java jdk/test/jdk/lambda/shapegen/RuleGroup.java jdk/test/jdk/lambda/shapegen/TTNode.java jdk/test/jdk/lambda/shapegen/TTParser.java jdk/test/jdk/lambda/shapegen/TTShape.java jdk/test/sun/security/provider/certpath/ReverseBuilder/BuildPath.java jdk/test/sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java jdk/test/sun/security/provider/certpath/ReverseBuilder/mgrM2leadMA jdk/test/sun/security/provider/certpath/ReverseBuilder/mgrM2mgrM jdk/test/sun/security/provider/certpath/ReverseBuilder/mgrM2prjM jdk/test/sun/security/provider/certpath/ReverseBuilder/mgrMcrl jdk/test/sun/security/provider/certpath/ReverseBuilder/prjM2divE jdk/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM jdk/test/sun/security/provider/certpath/ReverseBuilder/prjMcrl langtools/make/Makefile langtools/src/java.base/share/classes/jdk/Exported.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/PathFileManager.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/PathFileObject.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BaseFileManager.java langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java langtools/test/tools/javac/varargs/T8049075/VarargsAndWildcardParameterizedTypeTest.java make/Images.gmk make/jprt.properties modules.xml nashorn/make/Makefile nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js nashorn/test/src/jdk/internal/dynalink/beans/CallerSensitiveTest.java nashorn/test/src/jdk/nashorn/api/NashornSQLDriver.java nashorn/test/src/jdk/nashorn/api/javaaccess/ArrayConversionTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/ConsStringTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java nashorn/test/src/jdk/nashorn/api/javaaccess/Person.java nashorn/test/src/jdk/nashorn/api/javaaccess/SharedObject.java nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java nashorn/test/src/jdk/nashorn/api/scripting/InvocableTest.java nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java nashorn/test/src/jdk/nashorn/api/scripting/PluggableJSObjectTest.java nashorn/test/src/jdk/nashorn/api/scripting/ScopeTest.java nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java nashorn/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java nashorn/test/src/jdk/nashorn/api/scripting/VariableArityTestInterface.java nashorn/test/src/jdk/nashorn/api/scripting/Window.java nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java nashorn/test/src/jdk/nashorn/api/scripting/resources/func.js nashorn/test/src/jdk/nashorn/api/scripting/resources/gettersetter.js nashorn/test/src/jdk/nashorn/api/scripting/resources/witheval.js nashorn/test/src/jdk/nashorn/api/tree/ParseAPITest.java nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java nashorn/test/src/jdk/nashorn/internal/runtime/ClassFilterTest.java nashorn/test/src/jdk/nashorn/internal/runtime/CodeStoreAndPathTest.java nashorn/test/src/jdk/nashorn/internal/runtime/ConsStringTest.java nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java nashorn/test/src/jdk/nashorn/internal/runtime/ExceptionsNotSerializable.java nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java nashorn/test/src/jdk/nashorn/internal/runtime/LexicalBindingTest.java nashorn/test/src/jdk/nashorn/internal/runtime/NoPersistenceCachingTest.java nashorn/test/src/jdk/nashorn/internal/runtime/SourceTest.java nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java nashorn/test/src/jdk/nashorn/internal/runtime/regexp/JdkRegExpTest.java nashorn/test/src/jdk/nashorn/internal/runtime/regexp/joni/JoniTest.java nashorn/test/src/jdk/nashorn/internal/runtime/resources/load_test.js
diffstat 2861 files changed, 128947 insertions(+), 61614 deletions(-) [+]