Skip to contentSkip to conversation

kernel.h: Verify that arguments to swap() are the same type

PATCH In review Joe Perches 3 participants 5 messages Jul 16, 2009 – Jul 23, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel.h: Verify that arguments to swap() are the same type

include/linux/kernel.h +7 -2
index d6320a3..72878a5 100644
@@ -637,8 +637,13 @@ static inline void ftrace_dump(void) { }
 /*
  * swap - swap value of @a and @b
  */
-#define swap(a, b) \
-	do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#define swap(a, b)				\
+do {						\
+	typeof(a) __tmp = (a);			\
+	BUILD_BUG_ON(!__same_type(__tmp, (b)));	\
+	(a) = (b);				\
+	(b) = __tmp;				\
+} while (0)
 
 /**
  * container_of - cast a member of a structure out to the containing structure
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · Joe Perches

Hmm, sounds reasonable.

Does this catch any actual wrong usages of swap()?

Quoted 27 lines
include/linux/kernel.h +7 -3
index d6320a3..72878a5 100644
@@ -637,8 +637,13 @@ static inline void ftrace_dump(void) { }
 /*
 * swap - swap value of @a and @b
 */
-#define swap(a, b) \
-	do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#define swap(a, b)				\
+do {						\
+	typeof(a) __tmp = (a);			\
+	BUILD_BUG_ON(!__same_type(__tmp, (b)));	\
+	(a) = (b);				\
+	(b) = __tmp;				\
+} while (0)
 
 /**
 * container_of - cast a member of a structure out to the containing structure
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#3 lore raw
In reply to Joe Perches
Quoted 10 lines · On Wed, 15 Jul 2009 18:34:21 -0700 Joe Perches <[email protected]> wrote:
include/linux/kernel.h +0 -0
index d6320a3..72878a5 100644
@@ -637,8 +637,13 @@ static inline void ftrace_dump(void) { }
 /*
  * swap - swap value of @a and @b
  */

include/linux/kernel.h static inline void ftrace_dump(void) { } · line 647

Quoted 10 lines
include/linux/kernel.h +7 -2
-#define swap(a, b) \
-	do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#define swap(a, b)				\
+do {						\
+	typeof(a) __tmp = (a);			\
+	BUILD_BUG_ON(!__same_type(__tmp, (b)));	\
+	(a) = (b);				\
+	(b) = __tmp;				\
+} while (0)
 

I wonder if we can do

	typecheck(a, typeof(b));
#4 lore raw
Quoted 26 lines · Andrew Morton
Quoted 10 lines · On Wed, 15 Jul 2009 18:34:21 -0700 Joe Perches <[email protected]> wrote:
include/linux/kernel.h +0 -0
index d6320a3..72878a5 100644
@@ -637,8 +637,13 @@ static inline void ftrace_dump(void) { }
 /*
  * swap - swap value of @a and @b
  */

include/linux/kernel.h static inline void ftrace_dump(void) { } · line 647

Quoted 10 lines
include/linux/kernel.h +7 -2
-#define swap(a, b) \
-	do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#define swap(a, b)				\
+do {						\
+	typeof(a) __tmp = (a);			\
+	BUILD_BUG_ON(!__same_type(__tmp, (b)));	\
+	(a) = (b);				\
+	(b) = __tmp;				\
+} while (0)
 

I wonder if we can do

Quoted 1 line

typecheck(a, typeof(b));d

Yes. It generates a warning rather than a build bug. Maybe that's better.

$ cat -n typeck.c
     1	#define typecheck(type, x)			\
     2	  ({	type __dummy;				\
     3	    typeof(x) __dummy2;				\
     4	    (void)(&__dummy == &__dummy2);		\
     5	    1;						\
     6	  })
     7	
     8	#define swap(a, b)				\
     9	  do { typeof(a) __tmp;				\
    10	    typecheck(typeof(a), (b));			\
    11	    __tmp = (a);				\
    12	    (a) = (b);					\
    13	    (b) = __tmp;				\
    14	  } while (0)
    15	
    16	int main(int argc, char** argv)
    17	{
    18	  int a,b;
    19	  long j,k;
    20	  
    21	  swap(a,b);
    22	  swap(j,k);
    23	  swap(a,j);
    24	}
$ gcc typeck.c
typeck.c: In function ‘main’:
typeck.c:23: warning: comparison of distinct pointer types lacks a cast