use Py_REFCNT

benjaminp · benjaminp · commit d0de25d731d4 · 2010-09-10T23:52:42.000Z
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4394,7 +4394,7 @@ unicode_concatenate(PyObject *v, PyObject *w,
         return NULL;
     }
 
-    if (v->ob_refcnt == 2) {
+    if (Py_REFCNF(v) == 2) {
         /* In the common case, there are 2 references to the value
          * stored in 'variable' when the += is performed: one on the
          * value stack (in 'v') and one still stored in the
@@ -4435,7 +4435,7 @@ unicode_concatenate(PyObject *v, PyObject *w,
         }
     }
 
-    if (v->ob_refcnt == 1 && !PyUnicode_CHECK_INTERNED(v)) {
+    if (Py_REFCNF(v) == 1 && !PyUnicode_CHECK_INTERNED(v)) {
         /* Now we own the last reference to 'v', so we can resize it
          * in-place.
          */

Original file line number	Diff line number	Diff line change
`@@ -4394,7 +4394,7 @@ unicode_concatenate(PyObject v, PyObject w,`
`4394`	`4394`	`return NULL;`
`4395`	`4395`	`}`
`4396`	`4396`
`4397`		`- if (v->ob_refcnt == 2) {`
	`4397`	`+ if (Py_REFCNF(v) == 2) {`
`4398`	`4398`	`/* In the common case, there are 2 references to the value`
`4399`	`4399`	`* stored in 'variable' when the += is performed: one on the`
`4400`	`4400`	`* value stack (in 'v') and one still stored in the`
`@@ -4435,7 +4435,7 @@ unicode_concatenate(PyObject v, PyObject w,`
`4435`	`4435`	`}`
`4436`	`4436`	`}`
`4437`	`4437`
`4438`		`- if (v->ob_refcnt == 1 && !PyUnicode_CHECK_INTERNED(v)) {`
	`4438`	`+ if (Py_REFCNF(v) == 1 && !PyUnicode_CHECK_INTERNED(v)) {`
`4439`	`4439`	`/* Now we own the last reference to 'v', so we can resize it`
`4440`	`4440`	`* in-place.`
`4441`	`4441`	`*/`