Fix [[DefineOwnProperty]] on dictionary object with a not fully populated property descriptor.

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/JSDictionary.java

@@ -261,7 +261,7 @@ public PropertyDescriptor getOwnProperty(JSDynamicObject thisObj, Object key) {
     public boolean defineOwnProperty(JSDynamicObject thisObj, Object key, PropertyDescriptor desc, boolean doThrow) {
         assert JSRuntime.isPropertyKey(key);
         if (!hasOwnProperty(thisObj, key) && JSObject.isExtensible(thisObj)) {
-            getHashMap(thisObj).put(key, desc);
+            getHashMap(thisObj).put(key, makeFullyPopulatedPropertyDescriptor(desc));
             return true;
         }
 
@@ -271,6 +271,31 @@ public boolean defineOwnProperty(JSDynamicObject thisObj, Object key, PropertyDe
         return super.defineOwnProperty(thisObj, key, desc, doThrow);
     }
 
+    /**
+     * Returns a fully populated property descriptor that is either an accessor property descriptor
+     * or a data property descriptor that has all of the corresponding fields. Missing fields are
+     * filled with default values.
+     */
+    private static PropertyDescriptor makeFullyPopulatedPropertyDescriptor(PropertyDescriptor desc) {
+        if (desc.isAccessorDescriptor()) {
+            if (desc.hasGet() && desc.hasSet() && desc.hasEnumerable() && desc.hasConfigurable()) {
+                return desc;
+            } else {
+                return PropertyDescriptor.createAccessor(desc.getGet(), desc.getSet(), desc.getEnumerable(), desc.getConfigurable());
+            }
+        } else if (desc.isDataDescriptor()) {
+            if (desc.hasValue() && desc.hasWritable() && desc.hasEnumerable() && desc.hasConfigurable()) {
+                return desc;
+            } else {
+                Object value = desc.hasValue() ? desc.getValue() : Undefined.instance;
+                return PropertyDescriptor.createData(value, desc.getEnumerable(), desc.getWritable(), desc.getConfigurable());
+            }
+        } else {
+            assert desc.isGenericDescriptor();
+            return PropertyDescriptor.createData(Undefined.instance, desc.getEnumerable(), desc.getWritable(), desc.getConfigurable());
+        }
+    }
+
     @SuppressWarnings("unchecked")
     static EconomicMap<Object, PropertyDescriptor> getHashMap(JSDynamicObject obj) {
         assert JSDictionary.isJSDictionaryObject(obj);