diff mbox

[trans-mem] PATCH committed: cleanup attributes

Message ID 4D2F1F9F.5010404@redhat.com
State New
Headers show

Commit Message

Aldy Hernandez Jan. 13, 2011, 3:51 p.m. UTC 
[Courtesy of Patrick Marlier]

This patch renames the TM_PURE attributes to avoid confusion with GCC's 
PURE attribute.  Minor cleanups; all cosmetic.

Applied as obvious.
* builtin-attrs.def (ATTR_TM_PURE_NOTHROW_LIST): Remove duplicated
	attribute.
	(ATTR_TM_TMPURE): Rename from ATTR_TM_PURE to avoid confusion with
	pure attribute.
	* gtm-builtins.def: Likewise.
diff mbox

Patch

Index: builtin-attrs.def
===================================================================
--- builtin-attrs.def	(revision 168743)
+++ builtin-attrs.def	(working copy)
@@ -95,7 +95,7 @@  DEF_ATTR_IDENT (ATTR_STRFMON, "strfmon")
 DEF_ATTR_IDENT (ATTR_STRFTIME, "strftime")
 DEF_ATTR_IDENT (ATTR_TYPEGENERIC, "type generic")
 DEF_ATTR_IDENT (ATTR_TM_REGPARM, "*tm regparm")
-DEF_ATTR_IDENT (ATTR_TM_PURE, "transaction_pure")
+DEF_ATTR_IDENT (ATTR_TM_TMPURE, "transaction_pure")
 
 DEF_ATTR_TREE_LIST (ATTR_NOVOPS_LIST, ATTR_NOVOPS, ATTR_NULL, ATTR_NULL)
 
@@ -199,20 +199,15 @@  DEF_FORMAT_ATTRIBUTE_NOTHROW(STRFMON,3,3
 DEF_ATTR_TREE_LIST (ATTR_TM_NOTHROW_LIST,
 		    ATTR_TM_REGPARM, ATTR_NULL, ATTR_NOTHROW_LIST)
 DEF_ATTR_TREE_LIST (ATTR_TM_TMPURE_NOTHROW_LIST,
-		    ATTR_TM_PURE, ATTR_NULL, ATTR_TM_NOTHROW_LIST)
+		    ATTR_TM_TMPURE, ATTR_NULL, ATTR_TM_NOTHROW_LIST)
 DEF_ATTR_TREE_LIST (ATTR_TM_PURE_TMPURE_NOTHROW_LIST,
 		    ATTR_PURE, ATTR_NULL, ATTR_TM_TMPURE_NOTHROW_LIST)
 DEF_ATTR_TREE_LIST (ATTR_TM_NORETURN_NOTHROW_LIST,
 		    ATTR_TM_REGPARM, ATTR_NULL, ATTR_NORETURN_NOTHROW_LIST)
 DEF_ATTR_TREE_LIST (ATTR_TM_CONST_NOTHROW_LIST,
 		    ATTR_TM_REGPARM, ATTR_NULL, ATTR_CONST_NOTHROW_LIST)
-
-/* Same attributes used for BUILT_IN_MALLOC except with TM_PURE thrown in.  */
-DEF_ATTR_TREE_LIST (ATTR_TM_PURE_MALLOC_NOTHROW_LIST,
-		    ATTR_TM_PURE, ATTR_NULL, ATTR_MALLOC_NOTHROW_LIST)
-/* Same attributes used for BUILT_IN_FREE except with TM_PURE thrown in.  */
-DEF_ATTR_TREE_LIST (ATTR_TM_PURE_NOTHROW_LIST,
-		    ATTR_TM_PURE, ATTR_NULL, ATTR_NOTHROW_LIST)
+DEF_ATTR_TREE_LIST (ATTR_TM_TMPURE_MALLOC_NOTHROW_LIST,
+		    ATTR_TM_TMPURE, ATTR_NULL, ATTR_MALLOC_NOTHROW_LIST)
 
 /* Construct a tree for a format_arg attribute.  */
 #define DEF_FORMAT_ARG_ATTRIBUTE(FA)					\
Index: gtm-builtins.def
===================================================================
--- gtm-builtins.def	(revision 168743)
+++ gtm-builtins.def	(working copy)
@@ -11,9 +11,9 @@  DEF_TM_BUILTIN (BUILT_IN_TM_IRREVOCABLE,
 		BT_FN_INT, ATTR_TM_NOTHROW_LIST)
 
 DEF_TM_BUILTIN (BUILT_IN_TM_MEMCPY, "_ITM_memcpyRtWt",
-		BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_PURE_NOTHROW_LIST)
+		BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_TMPURE_NOTHROW_LIST)
 DEF_TM_BUILTIN (BUILT_IN_TM_MEMMOVE, "_ITM_memmoveRtWt",
-		BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_PURE_NOTHROW_LIST)
+		BT_FN_PTR_PTR_CONST_PTR_SIZE, ATTR_TM_TMPURE_NOTHROW_LIST)
 
 DEF_TM_BUILTIN (BUILT_IN_TM_GETTMCLONE_IRR, "_ITM_getTMCloneOrIrrevocable",
 		BT_FN_PTR_PTR, ATTR_TM_CONST_NOTHROW_LIST)
@@ -22,11 +22,11 @@  DEF_TM_BUILTIN (BUILT_IN_TM_GETTMCLONE_S
 
 /* Memory allocation builtins.  */
 DEF_TM_BUILTIN (BUILT_IN_TM_MALLOC, "_ITM_malloc",
-	        BT_FN_PTR_SIZE, ATTR_TM_PURE_MALLOC_NOTHROW_LIST)
+	        BT_FN_PTR_SIZE, ATTR_TM_TMPURE_MALLOC_NOTHROW_LIST)
 DEF_TM_BUILTIN (BUILT_IN_TM_CALLOC, "_ITM_calloc",
-	        BT_FN_PTR_SIZE_SIZE, ATTR_TM_PURE_MALLOC_NOTHROW_LIST)
+	        BT_FN_PTR_SIZE_SIZE, ATTR_TM_TMPURE_MALLOC_NOTHROW_LIST)
 DEF_TM_BUILTIN (BUILT_IN_TM_FREE, "_ITM_free",
-	        BT_FN_VOID_PTR, ATTR_TM_PURE_NOTHROW_LIST)
+	        BT_FN_VOID_PTR, ATTR_TM_TMPURE_NOTHROW_LIST)
 
 /* Logging builtins.  */
 DEF_TM_BUILTIN (BUILT_IN_TM_LOG_1, "_ITM_LU1",