InstrProf: Simplify/reduce state in CoverageMapping (NFC)

This state object makes things harder to reason about and isn't really
useful, since we can just emit the mappings before the state changes
rather than holding on to it.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@224476 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CoverageMappingGen.cpp b/lib/CodeGen/CoverageMappingGen.cpp
index ac0c22cbebe4cdbd89aa0118c5a750f6d49ab297..ada3a2de1db56dafc22787a7ee386e75932af582 100644 (file)
--- a/lib/CodeGen/CoverageMappingGen.cpp
+++ b/lib/CodeGen/CoverageMappingGen.cpp
@@ -117,19 +117,6 @@ public:
   }
 };
 
-/// \brief The state of the coverage mapping builder.
-struct SourceMappingState {
-  Counter CurrentRegionCount;
-  const Stmt *CurrentSourceGroup;
-  const Stmt *CurrentUnreachableRegionInitiator;
-
-  SourceMappingState(Counter CurrentRegionCount, const Stmt *CurrentSourceGroup,
-                     const Stmt *CurrentUnreachableRegionInitiator)
-      : CurrentRegionCount(CurrentRegionCount),
-        CurrentSourceGroup(CurrentSourceGroup),
-        CurrentUnreachableRegionInitiator(CurrentUnreachableRegionInitiator) {}
-};
-
 /// \brief Provides the common functionality for the different
 /// coverage mapping region builders.
 class CoverageMappingBuilder {
@@ -358,14 +345,6 @@ public:
                        Flags);
   }
 
-  void mapSourceCodeRange(const SourceMappingState &State,
-                          SourceLocation LocStart, SourceLocation LocEnd,
-                          unsigned Flags = 0) {
-    mapSourceCodeRange(LocStart, LocEnd, State.CurrentRegionCount,
-                       State.CurrentUnreachableRegionInitiator,
-                       State.CurrentSourceGroup, Flags);
-  }
-
   /// \brief Generate the coverage counter mapping regions from collected
   /// source regions.
   void emitSourceRegions() {
@@ -597,12 +576,6 @@ struct CounterCoverageMappingBuilder
     Writer.write(OS);
   }
 
-  /// \brief Return the current source mapping state.
-  SourceMappingState getCurrentState() const {
-    return SourceMappingState(CurrentRegionCount, CurrentSourceGroup,
-                              CurrentUnreachableRegionInitiator);
-  }
-
   /// \brief Associate the source code range with the current region count.
   void mapSourceCodeRange(SourceLocation LocStart, SourceLocation LocEnd,
                           unsigned Flags = 0) {
@@ -625,11 +598,6 @@ struct CounterCoverageMappingBuilder
         SourceMappingRegion::IgnoreIfNotExtended);
   }
 
-  void mapToken(const SourceMappingState &State, SourceLocation LocStart) {
-    CoverageMappingBuilder::mapSourceCodeRange(
-        State, LocStart, LocStart, SourceMappingRegion::IgnoreIfNotExtended);
-  }
-
   void VisitStmt(const Stmt *S) {
     mapSourceCodeRange(S->getLocStart());
     for (Stmt::const_child_range I = S->children(); I; ++I) {
@@ -658,14 +626,12 @@ struct CounterCoverageMappingBuilder
   }
 
   void VisitCompoundStmt(const CompoundStmt *S) {
-    SourceMappingState State = getCurrentState();
     mapSourceCodeRange(S->getLBracLoc());
+    mapSourceCodeRange(S->getRBracLoc());
     for (Stmt::const_child_range I = S->children(); I; ++I) {
       if (*I)
         this->Visit(*I);
     }
-    CoverageMappingBuilder::mapSourceCodeRange(State, S->getRBracLoc(),
-                                               S->getRBracLoc());
   }
 
   void VisitReturnStmt(const ReturnStmt *S) {
@@ -917,7 +883,7 @@ struct CounterCoverageMappingBuilder
   void VisitAbstractConditionalOperator(const AbstractConditionalOperator *E) {
     Visit(E->getCond());
     mapToken(E->getQuestionLoc());
-    auto State = getCurrentState();
+    mapToken(E->getColonLoc());
 
     // Counter tracks the "true" part of a conditional operator. The
     // count in the "false" part will be calculated from this counter.
@@ -926,8 +892,6 @@ struct CounterCoverageMappingBuilder
     Visit(E->getTrueExpr());
     Cnt.adjustForControlFlow();
 
-    mapToken(State, E->getColonLoc());
-
     Cnt.beginElseRegion();
     Visit(E->getFalseExpr());
     Cnt.adjustForControlFlow();