profile.c (branch_prob): Move declaration of local variable.

	* profile.c (branch_prob): Move declaration of local variable.  Remove
	obsolete ??? comment.  Expand the location explicitly instead of using
	the LOCATION_FILE and LOCATION_LINE macros.

From-SVN: r172019

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 33a774c3de8abf0973c78521aded9020b5d2c875..b63116b05bf1717c5ec258f54aa3697bb5061180 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * profile.c (branch_prob): Move declaration of local variable.  Remove
+       obsolete ??? comment.  Expand the location explicitly instead of using
+       the LOCATION_FILE and LOCATION_LINE macros.
+
 2011-04-06  Wei Guozhi  <carrot@google.com>
 
        PR target/47855

diff --git a/gcc/profile.c b/gcc/profile.c
index c5cada9e6043082b6d4df6ff5290f086c5297ddd..fd377486b856dadfc4def8a8f7699fa9898fc4ee 100644 (file)
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -1123,16 +1123,13 @@ branch_prob (void)
   /* Line numbers.  */
   if (coverage_begin_output ())
     {
-      gcov_position_t offset;
-
       /* Initialize the output.  */
       output_location (NULL, 0, NULL, NULL);
 
       FOR_EACH_BB (bb)
        {
          gimple_stmt_iterator gsi;
-
-         offset = 0;
+         gcov_position_t offset = 0;
 
          if (bb == ENTRY_BLOCK_PTR->next_bb)
            {
@@ -1150,15 +1147,14 @@ branch_prob (void)
                                 &offset, bb);
            }
 
-         /* Notice GOTO expressions we eliminated while constructing the
-            CFG.  */
+         /* Notice GOTO expressions eliminated while constructing the CFG.  */
          if (single_succ_p (bb)
              && single_succ_edge (bb)->goto_locus != UNKNOWN_LOCATION)
            {
-             location_t curr_location = single_succ_edge (bb)->goto_locus;
-             /* ??? The FILE/LINE API is inconsistent for these cases.  */
-             output_location (LOCATION_FILE (curr_location),
-                              LOCATION_LINE (curr_location), &offset, bb);
+             expanded_location curr_location
+               = expand_location (single_succ_edge (bb)->goto_locus);
+             output_location (curr_location.file, curr_location.line,
+                              &offset, bb);
            }
 
          if (offset)