diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13acf76809e..0647513b03f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-24  Cary Coutant  <ccoutant@google.com>
+
+	* tree-cfg.c (assign_discriminator): Add explicit parentheses.
+
 2009-07-24  Cary Coutant  <ccoutant@google.com>
 
 	* cfghooks.c (split_block): Copy discriminator to new block.
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index d818b6b52dc..49345c2535b 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -763,8 +763,8 @@ assign_discriminator (location_t locus, basic_block bb)
 
   first_in_to_bb = first_non_label_stmt (bb);
   last_in_to_bb = last_stmt (bb);
-  if (first_in_to_bb && same_line_p (locus, gimple_location (first_in_to_bb))
-      || last_in_to_bb && same_line_p (locus, gimple_location (last_in_to_bb)))
+  if ((first_in_to_bb && same_line_p (locus, gimple_location (first_in_to_bb)))
+      || (last_in_to_bb && same_line_p (locus, gimple_location (last_in_to_bb))))
     bb->discriminator = next_discriminator_for_locus (locus);
 }