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

     1.1 --- a/src/jdk/nashorn/internal/runtime/Property.java	Tue Apr 30 09:42:13 2013 +0200
     1.2 +++ b/src/jdk/nashorn/internal/runtime/Property.java	Tue Apr 30 10:05:42 2013 -0300
     1.3 @@ -41,7 +41,6 @@
     1.4   *
     1.5   * @see PropertyMap
     1.6   * @see AccessorProperty
     1.7 - * @see SpillProperty
     1.8   * @see UserAccessorProperty
     1.9   */
    1.10  public abstract class Property {
    1.11 @@ -64,7 +63,7 @@
    1.12  
    1.13      private static final int MODIFY_MASK     = 0b0000_0000_1111;
    1.14  
    1.15 -    /** Is this a spill property? See {@link SpillProperty} */
    1.16 +    /** Is this a spill property? See {@link AccessorProperty} */
    1.17      public static final int IS_SPILL         = 0b0000_0001_0000;
    1.18  
    1.19      /** Is this a function parameter? */
    1.20 @@ -88,7 +87,7 @@
    1.21      /** Property flags. */
    1.22      protected int flags;
    1.23  
    1.24 -    /** Property field number or spill slot */
    1.25 +    /** Property field number or spill slot. */
    1.26      private final int slot;
    1.27  
    1.28      /**
    1.29 @@ -248,7 +247,7 @@
    1.30       * Does this property use any slots in the spill array described in
    1.31       * {@link Property#isSpill}? In that case how many. Currently a property
    1.32       * only uses max one spill slot, but this may change in future representations
    1.33 -     * Only {@link SpillProperty} instances use spill slots
    1.34 +     * Only {@link AccessorProperty} instances use spill slots
    1.35       *
    1.36       * @return number of spill slots a property is using
    1.37       */
    1.38 @@ -345,6 +344,14 @@
    1.39      }
    1.40  
    1.41      /**
    1.42 +     * Get the field number or spill slot
    1.43 +     * @return number/slot, -1 if none exists
    1.44 +     */
    1.45 +    public int getSlot() {
    1.46 +        return slot;
    1.47 +    }
    1.48 +
    1.49 +    /**
    1.50       * Abstract method for retrieving the setter for the property. We do not know
    1.51       * anything about the internal representation when we request the setter, we only
    1.52       * know that the setter will take the property as a parameter of the given type.
    1.53 @@ -388,14 +395,6 @@
    1.54          return null;
    1.55      }
    1.56  
    1.57 -    /**
    1.58 -     * Get the field number or spill slot
    1.59 -     * @return number/slot, -1 if none exists
    1.60 -     */
    1.61 -    public int getSlot() {
    1.62 -        return slot;
    1.63 -    }
    1.64 -
    1.65      @Override
    1.66      public int hashCode() {
    1.67          final Class<?> type = getCurrentType();