[PATCH] Set discriminators for call stmts on the same line within the same basic block

[Eugene Rozenfeld <Eugene.Rozenfeld@microsoft.com>]

This change is based on commit 1e6c4a7a8fb8e20545bb9f9032d3854f3f794c18
by Dehao Chen in vendors/google/heads/gcc-4_8.

Tested on x86_64-pc-linux-gnu.

gcc/ChangeLog:
        * tree-cfg.cc (assign_discriminators): Set discriminators for call stmts
        on the same line within the same basic block.
---
 gcc/tree-cfg.cc | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index ade66c54499..8e2a3a5f6c6 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -1203,8 +1203,39 @@ assign_discriminators (void)
     {
       edge e;
       edge_iterator ei;
+      gimple_stmt_iterator gsi;
       gimple *last = last_stmt (bb);
       location_t locus = last ? gimple_location (last) : UNKNOWN_LOCATION;
+      location_t curr_locus = UNKNOWN_LOCATION;
+      int curr_discr = 0;
+
+      /* Traverse the basic block, if two function calls within a basic block
+       are mapped to the same line, assign a new discriminator because a call
+       stmt could be a split point of a basic block.  */
+      for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+       {
+         gimple *stmt = gsi_stmt (gsi);
+         expanded_location curr_locus_e;
+         if (curr_locus == UNKNOWN_LOCATION)
+           {
+             curr_locus = gimple_location (stmt);
+             curr_locus_e = expand_location (curr_locus);
+           }
+         else if (!same_line_p (curr_locus, &curr_locus_e, gimple_location (stmt)))
+           {
+             curr_locus = gimple_location (stmt);
+             curr_locus_e = expand_location (curr_locus);
+             curr_discr = 0;
+           }
+         else if (curr_discr != 0)
+           {
+             gimple_set_location (stmt, location_with_discriminator (
+                 gimple_location (stmt), curr_discr));
+           }
+         /* Allocate a new discriminator for CALL stmt.  */
+         if (gimple_code (stmt) == GIMPLE_CALL)
+           curr_discr = next_discriminator_for_locus (curr_locus);
+       }

       if (locus == UNKNOWN_LOCATION)
        continue;
--
2.25.1