diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d564c10ac2d0..1ee43b925e61 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* tree.h (EXPR_LOCATION): Use CAN_HAVE_LOCATION_P.
+
 2012-05-15  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/53358
diff --git a/gcc/tree.h b/gcc/tree.h
index 419d8f4e6389..cc9d4fbe5d97 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1684,7 +1684,7 @@ struct GTY(()) tree_constructor {
    decls and constants can be shared among multiple locations, so
    return nothing.  */
 #define EXPR_LOCATION(NODE) \
-  (EXPR_P ((NODE)) ? (NODE)->exp.locus : UNKNOWN_LOCATION)
+  (CAN_HAVE_LOCATION_P ((NODE)) ? (NODE)->exp.locus : UNKNOWN_LOCATION)
 #define SET_EXPR_LOCATION(NODE, LOCUS) EXPR_CHECK ((NODE))->exp.locus = (LOCUS)
 #define EXPR_HAS_LOCATION(NODE) (EXPR_LOCATION (NODE) != UNKNOWN_LOCATION)
 #define EXPR_LOC_OR_HERE(NODE) (EXPR_HAS_LOCATION (NODE) ? (NODE)->exp.locus : input_location)