hg: jdk9/sandbox/nashorn: Merge

stuart.marks at oracle.com stuart.marks at oracle.com
Mon Jan 25 23:51:44 UTC 2016


Changeset: 973fcc81e5b9
Author:    smarks
Date:      2016-01-25 14:18 -0800
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/973fcc81e5b9

Merge

- samples/EvalWithArbitraryThis.java.orig
- samples/Main.class
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/CallSiteDescriptor.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/ChainedCallSite.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DefaultBootstrapper.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinkerFactory.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/GuardedInvocationFilter.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/MonomorphicCallSite.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/NoSuchDynamicMethodException.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/RelinkableCallSite.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AbstractJavaLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanIntrospector.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeansLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDetector.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassString.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethod.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethodLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/FacetIntrospector.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/MaximallySpecific.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedMethod.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SingleDynamicMethod.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClass.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassIntrospector.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/messages.properties
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/package.html
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/ConversionComparator.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedInvocation.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedTypeConversion.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkRequest.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkerServices.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/MethodHandleTransformer.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/MethodTypeConversionStrategy.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/package.html
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/package.html
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AutoDiscovery.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassMap.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultInternalObjectFilter.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultPrelinkFilter.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Guards.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkRequestImpl.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkerServicesImpl.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Lookup.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NameCodec.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeConverterFactory.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeUtilities.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/messages.properties
- src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/package.html
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NumberToString.java
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template
- test/script/currently-failing/gettersetter.js
- test/script/currently-failing/property_delete.js
- test/src/jdk/internal/dynalink/beans/test/CallerSensitiveTest.java
- test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java



More information about the jdk9-sandbox-changes mailing list