jdk8-mips64-public/nashorn: comparison src/jdk/internal/dynalink/beans/BeanLinker.java

-:4dee46412516
+:e1146c9cc758
 MethodType.methodType(Object.class, Object.class));
 private static MethodHandle LIST_GUARD = Guards.getInstanceOfGuard(List.class);
 private static MethodHandle MAP_GUARD = Guards.getInstanceOfGuard(Map.class);
+private enum CollectionType {
+ARRAY, LIST, MAP
+};
 private GuardedInvocationComponent getElementGetter(final CallSiteDescriptor callSiteDescriptor,
 final LinkerServices linkerServices, final List<String> operations) throws Exception {
 final MethodType callSiteType = callSiteDescriptor.getMethodType();
 final Class<?> declaredType = callSiteType.parameterType(0);
 final GuardedInvocationComponent nextComponent = getGuardedInvocationComponent(callSiteDescriptor,
 // is, it'd be quite stupid of a call site creator to go though invokedynamic when it knows in advance they're
 // dealing with an array, or a list or map, but hey...
 // Note that for arrays and lists, using LinkerServices.asType() will ensure that any language specific linkers
 // in use will get a chance to perform any (if there's any) implicit conversion to integer for the indices.
 final GuardedInvocationComponent gic;
-final boolean isMap;
+final CollectionType collectionType;
 if(declaredType.isArray()) {
-gic = new GuardedInvocationComponent(MethodHandles.arrayElementGetter(declaredType));
+gic = createInternalFilteredGuardedInvocationComponent(MethodHandles.arrayElementGetter(declaredType), linkerServices);
-isMap = false;
+collectionType = CollectionType.ARRAY;
 } else if(List.class.isAssignableFrom(declaredType)) {
-gic = new GuardedInvocationComponent(GET_LIST_ELEMENT);
+gic = createInternalFilteredGuardedInvocationComponent(GET_LIST_ELEMENT, linkerServices);
-isMap = false;
+collectionType = CollectionType.LIST;
 } else if(Map.class.isAssignableFrom(declaredType)) {
-gic = new GuardedInvocationComponent(GET_MAP_ELEMENT);
+gic = createInternalFilteredGuardedInvocationComponent(GET_MAP_ELEMENT, linkerServices);
-isMap = true;
+collectionType = CollectionType.MAP;
 } else if(clazz.isArray()) {
-gic = getClassGuardedInvocationComponent(MethodHandles.arrayElementGetter(clazz), callSiteType);
+gic = getClassGuardedInvocationComponent(linkerServices.filterInternalObjects(MethodHandles.arrayElementGetter(clazz)), callSiteType);
-isMap = false;
+collectionType = CollectionType.ARRAY;
 } else if(List.class.isAssignableFrom(clazz)) {
-gic = new GuardedInvocationComponent(GET_LIST_ELEMENT, Guards.asType(LIST_GUARD, callSiteType), List.class,
+gic = createInternalFilteredGuardedInvocationComponent(GET_LIST_ELEMENT, Guards.asType(LIST_GUARD, callSiteType), List.class, ValidationType.INSTANCE_OF,
-ValidationType.INSTANCE_OF);
+linkerServices);
-isMap = false;
+collectionType = CollectionType.LIST;
 } else if(Map.class.isAssignableFrom(clazz)) {
-gic = new GuardedInvocationComponent(GET_MAP_ELEMENT, Guards.asType(MAP_GUARD, callSiteType), Map.class,
+gic = createInternalFilteredGuardedInvocationComponent(GET_MAP_ELEMENT, Guards.asType(MAP_GUARD, callSiteType), Map.class, ValidationType.INSTANCE_OF,
-ValidationType.INSTANCE_OF);
+linkerServices);
-isMap = true;
+collectionType = CollectionType.MAP;
 } else {
 // Can't retrieve elements for objects that are neither arrays, nor list, nor maps.
 return nextComponent;
 }
 // We can have "dyn:getElem:foo", especially in composites, i.e. "dyn:getElem|getProp|getMethod:foo"
 final String fixedKey = getFixedKey(callSiteDescriptor);
 // Convert the key to a number if we're working with a list or array
 final Object typedFixedKey;
-if(!isMap && fixedKey != null) {
+if(collectionType != CollectionType.MAP && fixedKey != null) {
 typedFixedKey = convertKeyToInteger(fixedKey, linkerServices);
 if(typedFixedKey == null) {
 // key is not numeric, it can never succeed
 return nextComponent;
 }
 if(nextComponent == null) {
 return gic.replaceInvocation(binder.bind(invocation));
 }
 final MethodHandle checkGuard;
-if(invocation == GET_LIST_ELEMENT) {
+switch(collectionType) {
+case LIST:
 checkGuard = convertArgToInt(RANGE_CHECK_LIST, linkerServices, callSiteDescriptor);
-} else if(invocation == GET_MAP_ELEMENT) {
+break;
+case MAP:
 // TODO: A more complex solution could be devised for maps, one where we do a get() first, and fold it
 // into a GWT that tests if it returned null, and if it did, do another GWT with containsKey()
 // that returns constant null (on true), or falls back to next component (on false)
-checkGuard = CONTAINS_MAP;
+checkGuard = linkerServices.filterInternalObjects(CONTAINS_MAP);
-} else {
+break;
+case ARRAY:
 checkGuard = convertArgToInt(RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
+break;
+default:
+throw new AssertionError();
 }
 final MethodPair matchedInvocations = matchReturnTypes(binder.bind(invocation),
 nextComponent.getGuardedInvocation().getInvocation());
 return nextComponent.compose(matchedInvocations.guardWithTest(binder.bindTest(checkGuard)), gi.getGuard(),
 gic.getValidatorClass(), gic.getValidationType());
+}
+private static GuardedInvocationComponent createInternalFilteredGuardedInvocationComponent(
+final MethodHandle invocation, final LinkerServices linkerServices) {
+return new GuardedInvocationComponent(linkerServices.filterInternalObjects(invocation));
+}
+private static GuardedInvocationComponent createInternalFilteredGuardedInvocationComponent(
+final MethodHandle invocation, final MethodHandle guard, final Class<?> validatorClass,
+final ValidationType validationType, final LinkerServices linkerServices) {
+return new GuardedInvocationComponent(linkerServices.filterInternalObjects(invocation), guard,
+validatorClass, validationType);
 }
 private static String getFixedKey(final CallSiteDescriptor callSiteDescriptor) {
 return callSiteDescriptor.getNameTokenCount() == 2 ? null : callSiteDescriptor.getNameToken(
 CallSiteDescriptor.NAME_OPERAND);
 // If declared type of receiver at the call site is already an array, a list or map, bind without guard. Thing
 // is, it'd be quite stupid of a call site creator to go though invokedynamic when it knows in advance they're
 // dealing with an array, or a list or map, but hey...
 // Note that for arrays and lists, using LinkerServices.asType() will ensure that any language specific linkers
 // in use will get a chance to perform any (if there's any) implicit conversion to integer for the indices.
-final boolean isMap;
+final CollectionType collectionType;
 if(declaredType.isArray()) {
-gic = new GuardedInvocationComponent(MethodHandles.arrayElementSetter(declaredType));
+gic = createInternalFilteredGuardedInvocationComponent(MethodHandles.arrayElementSetter(declaredType), linkerServices);
-isMap = false;
+collectionType = CollectionType.ARRAY;
 } else if(List.class.isAssignableFrom(declaredType)) {
-gic = new GuardedInvocationComponent(SET_LIST_ELEMENT);
+gic = createInternalFilteredGuardedInvocationComponent(SET_LIST_ELEMENT, linkerServices);
-isMap = false;
+collectionType = CollectionType.LIST;
 } else if(Map.class.isAssignableFrom(declaredType)) {
-gic = new GuardedInvocationComponent(PUT_MAP_ELEMENT);
+gic = createInternalFilteredGuardedInvocationComponent(PUT_MAP_ELEMENT, linkerServices);
-isMap = true;
+collectionType = CollectionType.MAP;
 } else if(clazz.isArray()) {
-gic = getClassGuardedInvocationComponent(MethodHandles.arrayElementSetter(clazz), callSiteType);
+gic = getClassGuardedInvocationComponent(linkerServices.filterInternalObjects(
-isMap = false;
+MethodHandles.arrayElementSetter(clazz)), callSiteType);
+collectionType = CollectionType.ARRAY;
 } else if(List.class.isAssignableFrom(clazz)) {
-gic = new GuardedInvocationComponent(SET_LIST_ELEMENT, Guards.asType(LIST_GUARD, callSiteType), List.class,
+gic = createInternalFilteredGuardedInvocationComponent(SET_LIST_ELEMENT, Guards.asType(LIST_GUARD, callSiteType), List.class, ValidationType.INSTANCE_OF,
-ValidationType.INSTANCE_OF);
+linkerServices);
-isMap = false;
+collectionType = CollectionType.LIST;
 } else if(Map.class.isAssignableFrom(clazz)) {
-gic = new GuardedInvocationComponent(PUT_MAP_ELEMENT, Guards.asType(MAP_GUARD, callSiteType), Map.class,
+gic = createInternalFilteredGuardedInvocationComponent(PUT_MAP_ELEMENT, Guards.asType(MAP_GUARD, callSiteType),
-ValidationType.INSTANCE_OF);
+Map.class, ValidationType.INSTANCE_OF, linkerServices);
-isMap = true;
+collectionType = CollectionType.MAP;
 } else {
 // Can't set elements for objects that are neither arrays, nor list, nor maps.
 gic = null;
-isMap = false;
+collectionType = null;
 }
 // In contrast to, say, getElementGetter, we only compute the nextComponent if the target object is not a map,
 // as maps will always succeed in setting the element and will never need to fall back to the next component
 // operation.
-final GuardedInvocationComponent nextComponent = isMap ? null : getGuardedInvocationComponent(
+final GuardedInvocationComponent nextComponent = collectionType == CollectionType.MAP ? null : getGuardedInvocationComponent(
 callSiteDescriptor, linkerServices, operations);
 if(gic == null) {
 return nextComponent;
 }
 // We can have "dyn:setElem:foo", especially in composites, i.e. "dyn:setElem|setProp:foo"
 final String fixedKey = getFixedKey(callSiteDescriptor);
 // Convert the key to a number if we're working with a list or array
 final Object typedFixedKey;
-if(!isMap && fixedKey != null) {
+if(collectionType != CollectionType.MAP && fixedKey != null) {
 typedFixedKey = convertKeyToInteger(fixedKey, linkerServices);
 if(typedFixedKey == null) {
 // key is not numeric, it can never succeed
 return nextComponent;
 }
 if(nextComponent == null) {
 return gic.replaceInvocation(binder.bind(invocation));
 }
-final MethodHandle checkGuard = convertArgToInt(invocation == SET_LIST_ELEMENT ? RANGE_CHECK_LIST :
+assert collectionType == CollectionType.LIST || collectionType == CollectionType.ARRAY;
+final MethodHandle checkGuard = convertArgToInt(collectionType == CollectionType.LIST ? RANGE_CHECK_LIST :
 RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
 final MethodPair matchedInvocations = matchReturnTypes(binder.bind(invocation),
 nextComponent.getGuardedInvocation().getInvocation());
 return nextComponent.compose(matchedInvocations.guardWithTest(binder.bindTest(checkGuard)), gi.getGuard(),
 gic.getValidatorClass(), gic.getValidationType());

Mercurial > jdk8-mips64-public > nashorn / file comparison

comparison: src/jdk/internal/dynalink/beans/BeanLinker.java

src/jdk/internal/dynalink/beans/BeanLinker.java