jdk8-mips64-public/nashorn: comparison src/jdk/nashorn/internal/runtime/ScriptObject.java

-:39e17373d8df
+:682889823712
 * @return new property
 */
 public final Property modifyOwnProperty(final Property oldProperty, final int propertyFlags, final ScriptFunction getter, final ScriptFunction setter) {
 Property newProperty;
 if (oldProperty instanceof UserAccessorProperty) {
-// re-use the slots of the old user accessor property.
 final UserAccessorProperty uc = (UserAccessorProperty) oldProperty;
+final int getterSlot = uc.getGetterSlot();
-int getterSlot = uc.getGetterSlot();
+final int setterSlot = uc.getSetterSlot();
-// clear the old getter and set the new getter
 setSpill(getterSlot, getter);
-// if getter function is null, flag the slot to be negative (less by 1)
-if (getter == null) {
-getterSlot = -getterSlot - 1;
-}
-int setterSlot = uc.getSetterSlot();
-// clear the old setter and set the new setter
 setSpill(setterSlot, setter);
-// if setter function is null, flag the slot to be negative (less by 1)
-if (setter == null) {
+// if just flipping getter and setter with new functions, no need to change property or map
-setterSlot = -setterSlot - 1;
+if (uc.flags == propertyFlags) {
+return oldProperty;
 }
 newProperty = new UserAccessorProperty(oldProperty.getKey(), propertyFlags, getterSlot, setterSlot);
-// if just flipping getter and setter with new functions, no need to change property or map
-if (oldProperty.equals(newProperty)) {
-return oldProperty;
-}
 } else {
 // erase old property value and create new user accessor property
 erasePropertyValue(oldProperty);
 newProperty = newUserAccessors(oldProperty.getKey(), propertyFlags, getter, setter);
 }
 * @param getter {@link UserAccessorProperty} defined getter, or null if none
 * @param setter {@link UserAccessorProperty} defined setter, or null if none
 */
 public final void setUserAccessors(final String key, final ScriptFunction getter, final ScriptFunction setter) {
 final Property oldProperty = getMap().findProperty(key);
-if (oldProperty != null) {
+if (oldProperty instanceof UserAccessorProperty) {
-final UserAccessorProperty newProperty = newUserAccessors(oldProperty.getKey(), oldProperty.getFlags(), getter, setter);
+final UserAccessorProperty ua = (UserAccessorProperty)oldProperty;
-modifyOwnProperty(oldProperty, newProperty);
+setSpill(ua.getGetterSlot(), getter);
+setSpill(ua.getSetterSlot(), setter);
 } else {
-final UserAccessorProperty newProperty = newUserAccessors(key, 0, getter, setter);
+addOwnProperty(newUserAccessors(key, oldProperty != null ? oldProperty.getFlags() : 0, getter, setter));
-addOwnProperty(newProperty);
 }
 }
 private static int getIntValue(final FindProperty find) {
 final MethodHandle getter = find.getGetter(int.class);
 NashornCallSiteDescriptor.isFastScope(desc) && !property.canChangeType() ? null : guard);
 }
 final ScriptObject prototype = find.getOwner();
-if (!property.hasGetterFunction()) {
+if (!property.hasGetterFunction(prototype)) {
 methodHandle = bindTo(methodHandle, prototype);
 }
 return new GuardedInvocation(methodHandle, getMap().getProtoGetSwitchPoint(proto, name), guard);
 }
 /*
 * Make a new UserAccessorProperty property. getter and setter functions are stored in
 * this ScriptObject and slot values are used in property object.
 */
-private UserAccessorProperty newUserAccessors(final String key, final int propertyFlags, final ScriptFunction getter, final ScriptFunction setter) {
+protected final UserAccessorProperty newUserAccessors(final String key, final int propertyFlags, final ScriptFunction getter, final ScriptFunction setter) {
-int oldSpillLength = getMap().getSpillLength();
+final UserAccessorProperty property = getMap().newUserAccessors(key, propertyFlags);
+setSpill(property.getGetterSlot(), getter);
-int getterSlot = oldSpillLength++;
+setSpill(property.getSetterSlot(), setter);
-setSpill(getterSlot, getter);
-// if getter function is null, flag the slot to be negative (less by 1)
+return property;
-if (getter == null) {
+}
-getterSlot = -getterSlot - 1;
-}
+protected final void setSpill(final int slot, final Object value) {
+if (spill == null) {
-int setterSlot = oldSpillLength++;
+// create new spill.
+spill = new Object[Math.max(slot + 1, SPILL_RATE)];
-setSpill(setterSlot, setter);
+} else if (slot >= spill.length) {
-// if setter function is null, flag the slot to be negative (less by 1)
+// grow spill as needed
-if (setter == null) {
+final Object[] newSpill = new Object[slot + 1];
-setterSlot = -setterSlot - 1;
+System.arraycopy(spill, 0, newSpill, 0, spill.length);
-}
+spill = newSpill;
+}
-return new UserAccessorProperty(key, propertyFlags, getterSlot, setterSlot);
-}
+spill[slot] = value;
+}
-private void setSpill(final int slot, final Object value) {
-if (slot >= 0) {
+protected Object getSpill(final int slot) {
-final int index = slot;
+return spill != null && slot < spill.length ? spill[slot] : null;
-if (spill == null) {
-// create new spill.
-spill = new Object[Math.max(index + 1, SPILL_RATE)];
-} else if (index >= spill.length) {
-// grow spill as needed
-final Object[] newSpill = new Object[index + 1];
-System.arraycopy(spill, 0, newSpill, 0, spill.length);
-spill = newSpill;
-}
-spill[index] = value;
-}
-}
-// user accessors are either stored in spill array slots
-// get the accessor value using slot number. Note that slot is spill array index.
-Object getSpill(final int slot) {
-final int index = slot;
-return (index < 0 || (index >= spill.length)) ? null : spill[index];
 }
 private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
 final Class<?>   own = ScriptObject.class;
 final MethodType mt  = MH.type(rtype, types);

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

comparison: src/jdk/nashorn/internal/runtime/ScriptObject.java

src/jdk/nashorn/internal/runtime/ScriptObject.java