Fix object.__dict__ with DescriptorDeleteMarker

steve-s · steve-s · commit 2bb6a9fffa47 · 2021-12-29T13:20:32.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -682,7 +682,7 @@ private static Object getDescrFromBuiltinBase(Object type, GetBaseClassNode getB
             return null;
         }
 
-        @Specialization(guards = {"!isNoValue(mapping)", "!isDict(mapping)"})
+        @Specialization(guards = {"!isNoValue(mapping)", "!isDict(mapping)", "!isDeleteMarker(mapping)"})
         Object dict(@SuppressWarnings("unused") Object self, Object mapping) {
             throw raise(TypeError, ErrorMessages.DICT_MUST_BE_SET_TO_DICT, mapping);
         }

Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,7 @@ private static Object getDescrFromBuiltinBase(Object type, GetBaseClassNode getB`
`682`	`682`	`return null;`
`683`	`683`	`}`
`684`	`684`
`685`		`- @Specialization(guards = {"!isNoValue(mapping)", "!isDict(mapping)"})`
	`685`	`+ @Specialization(guards = {"!isNoValue(mapping)", "!isDict(mapping)", "!isDeleteMarker(mapping)"})`
`686`	`686`	`Object dict(@SuppressWarnings("unused") Object self, Object mapping) {`
`687`	`687`	`throw raise(TypeError, ErrorMessages.DICT_MUST_BE_SET_TO_DICT, mapping);`
`688`	`688`	`}`