Some more recursion-depth-checking fixes

- Fix a test to do the correct number of iterations
- Catch more exceptions in PyDict_GetItem (now that more things can throw)

Author: kmod

src/runtime/dict.cpp

@@ -360,10 +360,23 @@ extern "C" BORROWED(PyObject*) PyDict_GetItem(PyObject* dict, PyObject* key) noe
     if (PyDict_Check(dict)) {
         BoxedDict* d = static_cast<BoxedDict*>(dict);
 
+        BoxAndHash h;
+        try {
+            h = BoxAndHash(key);
+        } catch (ExcInfo e) {
+            e.clear();
+            return NULL;
+        }
+
         /* preserve the existing exception */
         PyObject* err_type, *err_value, *err_tb;
         PyErr_Fetch(&err_type, &err_value, &err_tb);
-        Box* b = d->getOrNull(key);
+        Box* b = NULL;
+        try {
+            b = d->getOrNull(h);
+        } catch (ExcInfo e) {
+            e.clear();
+        }
         /* ignore errors */
         PyErr_Restore(err_type, err_value, err_tb);
         return b;

src/runtime/types.h

@@ -1035,13 +1035,17 @@ class BoxedDict : public Box {
 
     DEFAULT_CLASS_SIMPLE(dict_cls, true);
 
-    BORROWED(Box*) getOrNull(Box* k) {
-        const auto& p = d.find(BoxAndHash(k));
+    BORROWED(Box*) getOrNull(BoxAndHash k) {
+        const auto& p = d.find(k);
         if (p != d.end())
             return p->second;
         return NULL;
     }
 
+    BORROWED(Box*) getOrNull(Box* k) {
+        return getOrNull(BoxAndHash(k));
+    }
+
     class iterator {
     private:
         DictMap::iterator it;

test/tests/generator_recursion_checking.py

@@ -7,5 +7,5 @@ def test(n):
         g.next()
         l.append(g)
 
-for i in xrange(1000):
+for i in xrange(3):
     test(3500)