bpo-32889: update valgrind suppressions (GH-5779)

miss-islington · PaulPrice · web-flow · commit 69607b4ecf91 · 2018-02-20T22:27:38.000-08:00
Py_ADDRESS_IN_RANGE was renamed address_in_range in 3.6 (commit 3924f93). (cherry picked from commit ba51880) Co-authored-by: Paul Price <price@astro.princeton.edu>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-02-20-21-53-48.bpo-32889.J6eWy5.rst b/Misc/NEWS.d/next/Core and Builtins/2018-02-20-21-53-48.bpo-32889.J6eWy5.rst
@@ -0,0 +1,2 @@
+Update Valgrind suppression list to account for the rename of
+``Py_ADDRESS_IN_RANG`` to ``address_in_range``.
diff --git a/Misc/valgrind-python.supp b/Misc/valgrind-python.supp
@@ -8,7 +8,7 @@
 #		./python -E ./Lib/test/regrtest.py -u gui,network
 #
 # You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
-# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.
+# to use the preferred suppressions with address_in_range.
 #
 # If you do not want to recompile Python, you can uncomment
 # suppressions for PyObject_Free and PyObject_Realloc.
@@ -19,25 +19,25 @@
 {
    ADDRESS_IN_RANGE/Invalid read of size 4
    Memcheck:Addr4
-   fun:Py_ADDRESS_IN_RANGE
+   fun:address_in_range
 }
 
 {
    ADDRESS_IN_RANGE/Invalid read of size 4
    Memcheck:Value4
-   fun:Py_ADDRESS_IN_RANGE
+   fun:address_in_range
 }
 
 {
    ADDRESS_IN_RANGE/Invalid read of size 8 (x86_64 aka amd64)
    Memcheck:Value8
-   fun:Py_ADDRESS_IN_RANGE
+   fun:address_in_range
 }
 
 {
    ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
    Memcheck:Cond
-   fun:Py_ADDRESS_IN_RANGE
+   fun:address_in_range
 }
 
 #

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Update Valgrind suppression list to account for the rename of`
	`2`	+``Py_ADDRESS_IN_RANG`` to ``address_in_range``.
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`# ./python -E ./Lib/test/regrtest.py -u gui,network`
`9`	`9`	`#`
`10`	`10`	`# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER`
`11`		`-# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.`
	`11`	`+# to use the preferred suppressions with address_in_range.`
`12`	`12`	`#`
`13`	`13`	`# If you do not want to recompile Python, you can uncomment`
`14`	`14`	`# suppressions for PyObject_Free and PyObject_Realloc.`
`@@ -19,25 +19,25 @@`
`19`	`19`	`{`
`20`	`20`	`ADDRESS_IN_RANGE/Invalid read of size 4`
`21`	`21`	`Memcheck:Addr4`
`22`		`- fun:Py_ADDRESS_IN_RANGE`
	`22`	`+ fun:address_in_range`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`{`
`26`	`26`	`ADDRESS_IN_RANGE/Invalid read of size 4`
`27`	`27`	`Memcheck:Value4`
`28`		`- fun:Py_ADDRESS_IN_RANGE`
	`28`	`+ fun:address_in_range`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`{`
`32`	`32`	`ADDRESS_IN_RANGE/Invalid read of size 8 (x86_64 aka amd64)`
`33`	`33`	`Memcheck:Value8`
`34`		`- fun:Py_ADDRESS_IN_RANGE`
	`34`	`+ fun:address_in_range`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`{`
`38`	`38`	`ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value`
`39`	`39`	`Memcheck:Cond`
`40`		`- fun:Py_ADDRESS_IN_RANGE`
	`40`	`+ fun:address_in_range`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`#`