correct typographical errors.

[pf3gnuchains/gcc-fork.git] / gcc / profile.c

diff --git a/gcc/profile.c b/gcc/profile.c
index 0cc6552..b8a43de 100644 (file)
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -59,6 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "expr.h"
 #include "function.h"
+#include "basic-block.h"
+#include "diagnostic-core.h"
 #include "toplev.h"
 #include "coverage.h"
 #include "value-prof.h"
@@ -343,7 +345,7 @@ is_inconsistent (void)
         {
          if (dump_file)
            {
-             fprintf (dump_file, "BB %i count does not match sum of incomming edges "
+             fprintf (dump_file, "BB %i count does not match sum of incoming edges "
                       HOST_WIDEST_INT_PRINT_DEC" should be " HOST_WIDEST_INT_PRINT_DEC,
                       bb->index,
                       bb->count,
@@ -775,7 +777,7 @@ compute_value_histograms (histogram_values values)
   gcov_type *histogram_counts[GCOV_N_VALUE_COUNTERS];
   gcov_type *act_count[GCOV_N_VALUE_COUNTERS];
   gcov_type *aact_count;
- 
+
   for (t = 0; t < GCOV_N_VALUE_COUNTERS; t++)
     n_histogram_counters[t] = 0;
 
@@ -938,13 +940,14 @@ branch_prob (void)
          for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi); gsi_prev (&gsi))
            {
              last = gsi_stmt (gsi);
-             if (gimple_has_location (last))
+             if (!is_gimple_debug (last)
+                 && gimple_has_location (last))
                break;
            }
 
          /* Edge with goto locus might get wrong coverage info unless
-            it is the only edge out of BB.   
-            Don't do that when the locuses match, so 
+            it is the only edge out of BB.
+            Don't do that when the locuses match, so
             if (blah) goto something;
             is not computed twice.  */
          if (last
@@ -1127,7 +1130,7 @@ branch_prob (void)
 
          if (bb == ENTRY_BLOCK_PTR->next_bb)
            {
-             expanded_location curr_location = 
+             expanded_location curr_location =
                expand_location (DECL_SOURCE_LOCATION (current_function_decl));
              output_location (curr_location.file, curr_location.line,
                               &offset, bb);