Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER

akheron · akheron · commit 8d40f16a6021 · 2011-11-19T22:03:10.000+02:00
This allows compiling extension modules with -Wswitch-enum on gcc.
Initial patch by Floris Bruynooghe.
diff --git a/Include/pyatomic.h b/Include/pyatomic.h
@@ -64,7 +64,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
     case _Py_memory_order_seq_cst:
         _Py_ANNOTATE_HAPPENS_BEFORE(address);
         break;
-    default:
+    case _Py_memory_order_relaxed:
+    case _Py_memory_order_acquire:
         break;
     }
     switch(order) {
@@ -73,7 +74,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
     case _Py_memory_order_seq_cst:
         _Py_ANNOTATE_HAPPENS_AFTER(address);
         break;
-    default:
+    case _Py_memory_order_relaxed:
+    case _Py_memory_order_release:
         break;
     }
 }
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -124,6 +124,7 @@ Gary S. Brown
 Oleg Broytmann
 Dave Brueck
 Francisco Martín Brugué
+Floris Bruynooghe
 Stan Bubrouski
 Erik de Bueger
 Dick Bulterman
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.2.3?
 Core and Builtins
 -----------------
 
+- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER
+  to allow compiling extension modules with -Wswitch-enum on gcc.
+  Initial patch by Floris Bruynooghe.
+
 - Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder
   already accepts them).
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)`
`64`	`64`	`case _Py_memory_order_seq_cst:`
`65`	`65`	`_Py_ANNOTATE_HAPPENS_BEFORE(address);`
`66`	`66`	`break;`
`67`		`- default:`
	`67`	`+ case _Py_memory_order_relaxed:`
	`68`	`+ case _Py_memory_order_acquire:`
`68`	`69`	`break;`
`69`	`70`	`}`
`70`	`71`	`switch(order) {`
`@@ -73,7 +74,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)`
`73`	`74`	`case _Py_memory_order_seq_cst:`
`74`	`75`	`_Py_ANNOTATE_HAPPENS_AFTER(address);`
`75`	`76`	`break;`
`76`		`- default:`
	`77`	`+ case _Py_memory_order_relaxed:`
	`78`	`+ case _Py_memory_order_release:`
`77`	`79`	`break;`
`78`	`80`	`}`
`79`	`81`	`}`