Skip to content

Commit 80b3925

Browse files
authored
Merge pull request #51 from DinoV/fix_merge
Fix bad merge
2 parents fad3ae2 + 0c9b6a2 commit 80b3925

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Python/specialize.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,12 +1313,8 @@ specialize_load_global_lock_held(
13131313
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_LOAD_GLOBAL_NON_STRING_OR_SPLIT);
13141314
goto fail;
13151315
}
1316-
#ifdef Py_GIL_DISABLED
13171316
PyObject *value;
13181317
Py_ssize_t index = _PyDict_LookupIndexAndValue((PyDictObject *)globals, name, &value);
1319-
#else
1320-
Py_ssize_t index = _PyDictKeys_StringLookup(globals_keys, name);
1321-
#endif
13221318
if (index == DKIX_ERROR) {
13231319
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_EXPECTED_ERROR);
13241320
goto fail;

0 commit comments

Comments
 (0)