simplify hash*iterator exports

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/PDict.java

@@ -28,7 +28,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.ITEMS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.KEYS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.VALUES;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -232,20 +231,20 @@ static void removeHashEntry(PDict self, Object key,
     static Object getHashEntriesIterator(PDict self,
                     @Shared("iterLib") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
         Object dictItems = lib.lookupAndCallSpecialMethod(self, null, ITEMS);
-        return lib.lookupAndCallSpecialMethod(dictItems, null, __ITER__);
+        return lib.getIterator(dictItems);
     }
 
     @ExportMessage
     static Object getHashKeysIterator(PDict self,
                     @Shared("iterLib") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
-        Object dictItems = lib.lookupAndCallSpecialMethod(self, null, KEYS);
-        return lib.lookupAndCallSpecialMethod(dictItems, null, __ITER__);
+        Object dictKeys = lib.lookupAndCallSpecialMethod(self, null, KEYS);
+        return lib.getIterator(dictKeys);
     }
 
     @ExportMessage
     static Object getHashValuesIterator(PDict self,
                     @Shared("iterLib") @CachedLibrary(limit = "2") PythonObjectLibrary lib) {
-        Object dictItems = lib.lookupAndCallSpecialMethod(self, null, VALUES);
-        return lib.lookupAndCallSpecialMethod(dictItems, null, __ITER__);
+        Object dictValues = lib.lookupAndCallSpecialMethod(self, null, VALUES);
+        return lib.getIterator(dictValues);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/AccessForeignItemNodes.java

@@ -189,7 +189,11 @@ Object doHashKey(Object object, Object key,
                     throw CompilerDirectives.shouldNotReachHere(e);
                 }
             }
-            throw raise(KeyError, lib.toDisplayString(key, true));
+            try {
+                throw raise(KeyError, lib.asString(lib.toDisplayString(key, true)));
+            } catch (UnsupportedMessageException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
         }
 
         @Fallback
@@ -292,7 +296,11 @@ Object doHashKey(Object object, Object key, Object value,
                 }
             }
             wrongIndex.enter();
-            throw raise(KeyError, lib.toDisplayString(key, true));
+            try {
+                throw raise(KeyError, lib.asString(lib.toDisplayString(key, true)));
+            } catch (UnsupportedMessageException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
         }
 
         @Fallback
@@ -372,7 +380,11 @@ Object doHashKey(Object object, Object key,
                     throw CompilerDirectives.shouldNotReachHere(e);
                 }
             }
-            throw raise(KeyError, lib.toDisplayString(key, true));
+            try {
+                throw raise(KeyError, lib.asString(lib.toDisplayString(key, true)));
+            } catch (UnsupportedMessageException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
         }
 
         @Fallback