Handle hidden values in the short-circuit

python · encukou · Jul 30, 2024 · Jul 26, 2024 · Jul 26, 2024 · Jul 27, 2024
commit f5df751f1088678050b471e908969b1e746a09ff
@@ -67,6 +67,7 @@ framelocalsproxy_getkeyindex(PyFrameObject *frame, PyObject* key, bool read)
    if (key_hash == -1) {
        return -2;
    }
+    bool found = false;

    // We do 2 loops here because it's highly possible the key is interned
    // and we can do a pointer comparison.
@@ -82,9 +83,12 @@ framelocalsproxy_getkeyindex(PyFrameObject *frame, PyObject* key, bool read)
                    return i;
                }
            }
-            return -1;
+            found = true;
        }
    }
+    if (found) {
+        return -1;
+    }
    // This is unlikely, but we need to make sure. This means the key
    // is not interned.
    for (int i = 0; i < co->co_nlocalsplus; i++) {
@@ -108,7 +112,6 @@ framelocalsproxy_getkeyindex(PyFrameObject *frame, PyObject* key, bool read)
                    return i;
                }
            }
-            return -1;
        }
    }