Restore _GUARD_KEYS_VERSION in LOAD_ATTR specializations

[ddorian]

partial fix for #115

[DinoV]

Oh, this is interesting, and is going to need some changes to how we build things internally too. We end up generating the generated_cases.c.h from Meta Python 3.14 https://github.com/facebookincubator/cinder/tree/meta/3.14 where we've backported the upstream support for not needing the guards keys version. In addition to the backout here we'll need to update our internal syncing scripts too.

Or maybe what's easier would be to update cinder-bytecodes.c to have the _GUARD_KEYS_VERSION inlined into the opcode and if it ifdef'd under META_PYTHON.

[DinoV]

Oh, this is interesting, and is going to need some changes to how we build things internally too. We end up generating the generated_cases.c.h from Meta Python 3.14 https://github.com/facebookincubator/cinder/tree/meta/3.14 where we've backported the upstream support for not needing the guards keys version. In addition to the backout here we'll need to update our internal syncing scripts too.

Or maybe what's easier would be to update cinder-bytecodes.c to have the _GUARD_KEYS_VERSION inlined into the opcode and if it ifdef'd under META_PYTHON.

@ddorian If you'd like to land the full fix for it I think we just need to add:

        op(_GUARD_KEYS_VERSION, (keys_version/2, owner -- owner)) {
#ifndef META_PYTHON
            PyTypeObject *owner_cls = Py_TYPE(PyStackRef_AsPyObjectBorrow(owner));
            PyHeapTypeObject *owner_heap_type = (PyHeapTypeObject *)owner_cls;
            PyDictKeysObject *keys = owner_heap_type->ht_cached_keys;
            DEOPT_IF(FT_ATOMIC_LOAD_UINT32_RELAXED(keys->dk_version) != keys_version);
#endif
        }

        // Added for compatibility w/ non meta Python where we need to do _GUARD_KEYS_VERSION still
        macro(LOAD_ATTR_METHOD_WITH_VALUES) =
            unused/1 +
            _GUARD_TYPE_VERSION +
            _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT +
            _GUARD_KEYS_VERSION +
            _LOAD_ATTR_METHOD_WITH_VALUES;

``` into cinderx/Interpreter/3.14/cinder-bytecodes.c and the equivalent version for 3.15 and then your `_GUARD_KEYS_VERSION` in the generated_cases file would get the same ifndef as well. Or we can land the fix to the bytecodes internally and just land this w/ the tests.

[ddorian]

@DinoV

Oh, this is interesting, and is going to need some changes to how we build things internally too. We end up generating the generated_cases.c.h from Meta Python 3.14 https://github.com/facebookincubator/cinder/tree/meta/3.14 where we've backported the upstream support for not needing the guards keys version. In addition to the backout here we'll need to update our internal syncing scripts too.

Can you do the syncing and I rebase on top of it?

[ddorian]

I've rebased this here with all tests green: ddorian#3

Should I push the rebased version here? Are you still interested in this PR?

[DinoV]

I've rebased this here with all tests green: ddorian#3

Should I push the rebased version here? Are you still interested in this PR?

Yes, push the rebased version here and we'll go ahead and import it!

[ddorian]

@DinoV pushed

Addressed

[meta-codesync]

@DinoV has imported this pull request. If you are a Meta employee, you can view this in D118315962.

[meta-codesync]

@DinoV merged this pull request in 089c5c2.

[DinoV]

Thanks for the PR!