Import LLVM 6.0.1 release including clang, lld and lldb.

"where is the kaboom?" deraadt@

1 files changed, 9 insertions, 9 deletions

diff --git a/gnu/llvm/tools/llvm-cov/SourceCoverageViewText.h b/gnu/llvm/tools/llvm-cov/SourceCoverageViewText.h
index c3f20de9297..cabf91975df 100644
--- a/gnu/llvm/tools/llvm-cov/SourceCoverageViewText.h
+++ b/gnu/llvm/tools/llvm-cov/SourceCoverageViewText.h
@@ -18,6 +18,8 @@
 
 namespace llvm {
 
+using namespace coverage;
+
 /// \brief A coverage printer for text output.
 class CoveragePrinterText : public CoveragePrinter {
 public:
@@ -27,7 +29,8 @@ public:
   void closeViewFile(OwnedStream OS) override;
 
   Error createIndexFile(ArrayRef<std::string> SourceFiles,
-                        const coverage::CoverageMapping &Coverage) override;
+                        const CoverageMapping &Coverage,
+                        const CoverageFiltersMatchAll &Filters) override;
 
   CoveragePrinterText(const CoverageViewOptions &Opts)
       : CoveragePrinter(Opts) {}
@@ -47,14 +50,11 @@ class SourceCoverageViewText : public SourceCoverageView {
 
   void renderViewDivider(raw_ostream &OS, unsigned ViewDepth) override;
 
-  void renderLine(raw_ostream &OS, LineRef L,
-                  const coverage::CoverageSegment *WrappedSegment,
-                  CoverageSegmentArray Segments, unsigned ExpansionCol,
-                  unsigned ViewDepth) override;
+  void renderLine(raw_ostream &OS, LineRef L, const LineCoverageStats &LCS,
+                  unsigned ExpansionCol, unsigned ViewDepth) override;
 
   void renderExpansionSite(raw_ostream &OS, LineRef L,
-                           const coverage::CoverageSegment *WrappedSegment,
-                           CoverageSegmentArray Segments, unsigned ExpansionCol,
+                           const LineCoverageStats &LCS, unsigned ExpansionCol,
                            unsigned ViewDepth) override;
 
   void renderExpansionView(raw_ostream &OS, ExpansionView &ESV,
@@ -68,7 +68,7 @@ class SourceCoverageViewText : public SourceCoverageView {
 
   void renderLineNumberColumn(raw_ostream &OS, unsigned LineNo) override;
 
-  void renderRegionMarkers(raw_ostream &OS, CoverageSegmentArray Segments,
+  void renderRegionMarkers(raw_ostream &OS, const LineCoverageStats &Line,
                            unsigned ViewDepth) override;
 
   void renderTitle(raw_ostream &OS, StringRef Title) override;
@@ -79,7 +79,7 @@ class SourceCoverageViewText : public SourceCoverageView {
 public:
   SourceCoverageViewText(StringRef SourceName, const MemoryBuffer &File,
                          const CoverageViewOptions &Options,
-                         coverage::CoverageData &&CoverageInfo)
+                         CoverageData &&CoverageInfo)
       : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo)) {
   }
 };