c-typeck.c (emit_side_effect_warnings): Use EXPR_HAS_LOCATION instead of…

c-typeck.c (emit_side_effect_warnings): Use EXPR_HAS_LOCATION instead of EXPR_LOCUS in a boolean context...


	* c-typeck.c (emit_side_effect_warnings):  Use EXPR_HAS_LOCATION
	instead of EXPR_LOCUS in a boolean context, which is always true
	if --enable-mapped-location.
	* stmt.c (warn_if_unused_value):  Likewise.  Also use EXPR_LOCATION.

From-SVN: r84698

gcc/ChangeLog

+2004-07-14  Per Bothner  <per@bothner.com>
+
+	* c-typeck.c (emit_side_effect_warnings):  Use EXPR_HAS_LOCATION
+	instead of EXPR_LOCUS in a boolean context, which is always true
+	if --enable-mapped-location.
+	* stmt.c (warn_if_unused_value):  Likewise.  Also use EXPR_LOCATION.
+
 2004-07-14  Richard Henderson  <rth@redhat.com>
 
 	* dominance.c (struct dom_info): Add fake_exit_edge.

gcc/c-typeck.c

@@ -6582,7 +6582,7 @@ emit_side_effect_warnings (tree expr)
     {
       if (!VOID_TYPE_P (TREE_TYPE (expr)) && !TREE_NO_WARNING (expr))
 	warning ("%Hstatement with no effect",
-		 EXPR_LOCUS (expr) ? EXPR_LOCUS (expr) : &input_location);
+		 EXPR_HAS_LOCATION (expr) ? EXPR_LOCUS (expr) : &input_location);
     }
   else if (warn_unused_value)
     warn_if_unused_value (expr, input_location);

gcc/stmt.c

@@ -1634,8 +1634,8 @@ warn_if_unused_value (tree exp, location_t locus)
   if (VOID_TYPE_P (TREE_TYPE (exp)))
     return 0;
 
-  if (EXPR_LOCUS (exp))
-    locus = *EXPR_LOCUS (exp);
+  if (EXPR_HAS_LOCATION (exp))
+    locus = EXPR_LOCATION (exp);
 
   switch (TREE_CODE (exp))
     {