postgres.git / summary / log / commit / refs

commit    7c19e0446c049dd41aed62fa398cd809017adf5e
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Oct 18 21:39:14 2011 +0000
First released in: 9.2.0

    Remove unnecessary AssertMacro() to suppress gcc 4.6 compiler warning.
    
    There's no particular value in doing AssertMacro((tup) != NULL) in front
    of code that's certain to crash anyway if tup is NULL.  And if "tup" is
    actually the address of a local variable, gcc 4.6 whinges about it.  That's
    arguably pretty broken on gcc's part, but we might as well remove the
    useless test to silence the warnings.  This gets rid of all the -Waddress
    warnings in the backend; there are some in libpq and psql that are a bit
    harder to avoid.


 src/include/access/htup.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index c0258354e6f..966e2d0299e 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -839,8 +839,6 @@ extern Datum fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
  * ----------------
  */
 #define heap_getattr(tup, attnum, tupleDesc, isnull) \
-( \
-	AssertMacro((tup) != NULL), \
 	( \
 		((attnum) > 0) ? \
 		( \
@@ -854,8 +852,7 @@ extern Datum fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
 		) \
 		: \
 			heap_getsysattr((tup), (attnum), (tupleDesc), (isnull)) \
-	) \
-)
+	)
 
 /* prototypes for functions in common/heaptuple.c */
 extern Size heap_compute_data_size(TupleDesc tupleDesc,


[parent: b246207bd7b5]