Fix compilation after a rebase

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/BuiltinMethodDescriptors.java

@@ -42,8 +42,10 @@
 
 import static com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor.get;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.objects.dict.DictBuiltinsFactory;
 import com.oracle.graal.python.builtins.objects.module.ModuleBuiltinsFactory;
 import com.oracle.graal.python.builtins.objects.object.ObjectBuiltinsFactory;
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltinsFactory;
@@ -58,6 +60,8 @@ public abstract class BuiltinMethodDescriptors {
     public static final BuiltinMethodDescriptor MODULE_GET_ATTRIBUTE = get(__GETATTRIBUTE__, ModuleBuiltinsFactory.ModuleGetattritbuteNodeFactory.getInstance(), PythonBuiltinClassType.PythonModule);
     public static final BuiltinMethodDescriptor TYPE_GET_ATTRIBUTE = get(__GETATTRIBUTE__, TypeBuiltinsFactory.GetattributeNodeFactory.getInstance(), PythonBuiltinClassType.PythonClass);
 
+    public static final BuiltinMethodDescriptor DICT_ITER = get(__ITER__, DictBuiltinsFactory.IterNodeFactory.getInstance(), PythonBuiltinClassType.PDict);
+
     private BuiltinMethodDescriptors() {
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/ConcatKeywordsNode.java

@@ -49,6 +49,7 @@
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltinsFactory;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
+import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptors;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.nodes.PGuards;
@@ -165,11 +166,9 @@ HashingStorage doMapping(VirtualFrame frame, HashingStorage dest, Object other,
             }
         }
 
-        protected static final BuiltinMethodDescriptor builtinDictIter = BuiltinMethodDescriptor.get(DictBuiltinsFactory.IterNodeFactory.getInstance(), PythonBuiltinClassType.PDict);
-
         /* CPython tests that tp_iter is dict_iter */
         protected static boolean hasBuiltinIter(PDict dict, GetClassNode getClassNode, LookupCallableSlotInMRONode lookupIter) {
-            return PGuards.isBuiltinDict(dict) || lookupIter.execute(getClassNode.execute(dict)) == builtinDictIter;
+            return PGuards.isBuiltinDict(dict) || lookupIter.execute(getClassNode.execute(dict)) == BuiltinMethodDescriptors.DICT_ITER;
         }
     }
 }