GH-127705: Revert "Move mortal decrefs to internal header and make sure _PyReftracerTrack is called" - #131500
Closed
encukou wants to merge 1 commit into
Closed
GH-127705: Revert "Move mortal decrefs to internal header and make sure _PyReftracerTrack is called"#131500encukou wants to merge 1 commit into
encukou wants to merge 1 commit into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
…ake sure _PyReftracerTrack is called" This broke Py_TRACE_REFS builds. This reverts commit fd545d7.
Copy link
Copy Markdown
Contributor
|
This is easy to fix. _Py_Dealloc() is responsible for _Py_ForgetReference() so we only should include it manually if we're not going to call _Py_Dealloc(). diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
index 08cbfe46b0d..30b88404bbe 100644
--- a/Include/internal/pycore_object.h
+++ b/Include/internal/pycore_object.h
@@ -445,9 +445,6 @@ static inline void Py_DECREF_MORTAL(const char *filename, int lineno, PyObject *
_Py_DECREF_DecRefTotal();
}
if (--op->ob_refcnt == 0) {
-#ifdef Py_TRACE_REFS
- _Py_ForgetReference(op);
-#endif
_Py_Dealloc(op);
}
} |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
Thanks Sam |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
Issue fixed by 684a759, this revert is no longer needed. |
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This reverts commit fd545d7,
which broke Py_TRACE_REFS builds.