Refactor PropertyDescriptor and ensure that data property descriptor value is not null.

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/JSGetOwnPropertyNode.java

@@ -126,8 +126,20 @@ PropertyDescriptor array(JSDynamicObject thisObj, Object propertyKey,
         if (JSRuntime.isArrayIndex(idx)) {
             ScriptArray array = typeProfile.profile(JSAbstractArray.arrayGetArrayType(thisObj));
             if (array.hasElement(thisObj, idx)) {
-                Object value = needValue ? array.getElement(thisObj, idx) : null;
-                return PropertyDescriptor.createData(value, true, needWritability && !array.isFrozen(), needConfigurability && !array.isSealed());
+                PropertyDescriptor desc = PropertyDescriptor.createEmpty();
+                if (needEnumerability) {
+                    desc.setEnumerable(true);
+                }
+                if (needConfigurability) {
+                    desc.setConfigurable(!array.isSealed());
+                }
+                if (needWritability) {
+                    desc.setWritable(!array.isFrozen());
+                }
+                if (needValue) {
+                    desc.setValue(array.getElement(thisObj, idx));
+                }
+                return desc;
             }
         }
         noSuchElementBranch.enter();
@@ -188,22 +200,18 @@ private PropertyDescriptor ordinaryGetOwnProperty(JSDynamicObject thisObj, Prope
         if (hasPropertyBranch.profile(prop == null)) {
             return null;
         }
-        PropertyDescriptor d;
+        PropertyDescriptor d = PropertyDescriptor.createEmpty();
         if (isDataPropertyBranch.profile(JSProperty.isData(prop))) {
-            Object value = needValue ? getDataPropertyValue(thisObj, prop) : null;
-            d = PropertyDescriptor.createData(value);
             if (needWritability) {
                 d.setWritable(JSProperty.isWritable(prop));
             }
+            if (needValue) {
+                d.setValue(getDataPropertyValue(thisObj, prop));
+            }
         } else if (isAccessorPropertyBranch.profile(JSProperty.isAccessor(prop))) {
             if (needValue) {
-                Accessor acc = (Accessor) prop.getLocation().get(thisObj);
-                d = PropertyDescriptor.createAccessor(acc.getGetter(), acc.getSetter());
-            } else {
-                d = PropertyDescriptor.createAccessor(null, null);
+                d.setAccessor((Accessor) prop.getLocation().get(thisObj));
             }
-        } else {
-            d = PropertyDescriptor.createEmpty();
         }
         if (needEnumerability) {
             d.setEnumerable(JSProperty.isEnumerable(prop));

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/objects/PropertyDescriptor.java

@@ -84,12 +84,7 @@ public static PropertyDescriptor createData(Object value, boolean isEnumerable,
     }
 
     public static PropertyDescriptor createData(Object value, int attributes) {
-        PropertyDescriptor desc = new PropertyDescriptor();
-        desc.setValue(value);
-        desc.setEnumerable(JSAttributes.isEnumerable(attributes));
-        desc.setWritable(JSAttributes.isWritable(attributes));
-        desc.setConfigurable(JSAttributes.isConfigurable(attributes));
-        return desc;
+        return createData(value, JSAttributes.isEnumerable(attributes), JSAttributes.isWritable(attributes), JSAttributes.isConfigurable(attributes));
     }
 
     public static PropertyDescriptor createData(Object value) {
@@ -117,10 +112,7 @@ public static PropertyDescriptor createAccessor(Object getter, Object setter) {
     }
 
     public static PropertyDescriptor createAccessor(Object getter, Object setter, int attributes) {
-        PropertyDescriptor desc = createAccessor(getter, setter);
-        desc.setEnumerable(JSAttributes.isEnumerable(attributes));
-        desc.setConfigurable(JSAttributes.isConfigurable(attributes));
-        return desc;
+        return createAccessor(getter, setter, JSAttributes.isEnumerable(attributes), JSAttributes.isConfigurable(attributes));
     }
 
     public static PropertyDescriptor createAccessor(Object getter, Object setter, boolean isEnumerable, boolean isConfigurable) {
@@ -138,6 +130,8 @@ public Object getValue() {
     }
 
     public void setValue(Object value) {
+        assert !isAccessorDescriptor() : this;
+        assert value != null;
         this.data = value;
         this.flags |= HAS_VALUE;
     }
@@ -174,6 +168,12 @@ public void setSet(Object set) {
         this.flags |= HAS_SET;
     }
 
+    public void setAccessor(Accessor accessor) {
+        assert !isDataDescriptor() : this;
+        this.data = accessor;
+        this.flags |= HAS_GET | HAS_SET;
+    }
+
     public boolean getEnumerable() {
         return (this.flags & ENUMERABLE) != 0;
     }