Index: llvm/trunk/docs/CommandGuide/llvm-cov.rst =================================================================== --- llvm/trunk/docs/CommandGuide/llvm-cov.rst +++ llvm/trunk/docs/CommandGuide/llvm-cov.rst @@ -238,7 +238,7 @@ .. option:: -format= - Use the specified output format. The supported formats are: "text". + Use the specified output format. The supported formats are: "text", "html". .. option:: -output-dir=PATH Index: llvm/trunk/test/tools/llvm-cov/showLineExecutionCounts.cpp =================================================================== --- llvm/trunk/test/tools/llvm-cov/showLineExecutionCounts.cpp +++ llvm/trunk/test/tools/llvm-cov/showLineExecutionCounts.cpp @@ -38,3 +38,34 @@ // Test index creation. // RUN: FileCheck -check-prefix=INDEX -input-file %t.dir/index.txt %s // INDEX: showLineExecutionCounts.cpp.txt +// +// Test html output. +// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -format html -o %t.html.dir -instr-profile %t.profdata -filename-equivalence %s +// RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -format html -o %t.html.dir -instr-profile %t.profdata -filename-equivalence -name=main %s +// RUN: FileCheck -check-prefixes=HTML,HTML-WHOLE-FILE -input-file %t.html.dir/coverage/tmp/showLineExecutionCounts.cpp.html %s +// RUN: FileCheck -check-prefixes=HTML,HTML-FILTER -input-file %t.html.dir/functions.html %s +// +// HTML-WHOLE-FILE:
[[@LINE-44]]
// before
+// HTML-FILTER-NOT: 
[[@LINE-45]]
// before
+// HTML: 
161
[[@LINE-44]]
int main() {
+// HTML: 
161
[[@LINE-44]]
  int x = 0
+// HTML: 
161
[[@LINE-44]]
+// HTML: 
0
[[@LINE-44]]
  if (x) {
+// HTML: 
0
[[@LINE-44]]
+// HTML: 
161
[[@LINE-44]]
  }
+// HTML: 
161
[[@LINE-44]]
    x = 1;
+// HTML: 
161
[[@LINE-44]]
  }
+// HTML: 
161
[[@LINE-44]]
+// HTML: 
16.2k
[[@LINE-44]]
  for (int i = 0; i < 100; ++i)
+// HTML: 
16.1k
[[@LINE-44]]
    x = 1;
+// HTML: 
16.1k
[[@LINE-44]]
  }
+// HTML: 
161
[[@LINE-44]]
+// HTML: 
161
[[@LINE-44]]
  x = x < 10
+// HTML: 
161
[[@LINE-44]]
  x = x > 10
+// HTML: 
0
[[@LINE-44]]
        x - 1:
+// HTML: 
161
[[@LINE-44]]
        x + 1;
+// HTML: 
161
[[@LINE-44]]
+// HTML: 
161
[[@LINE-44]]
  return 0;
+// HTML: 
161
[[@LINE-44]]
}
+// HTML-WHOLE-FILE: 
[[@LINE-44]]
// after
+// HTML-FILTER-NOT: 
[[@LINE-45]]
// after
Index: llvm/trunk/test/tools/llvm-cov/showTemplateInstantiations.cpp
===================================================================
--- llvm/trunk/test/tools/llvm-cov/showTemplateInstantiations.cpp
+++ llvm/trunk/test/tools/llvm-cov/showTemplateInstantiations.cpp
@@ -38,3 +38,48 @@
 }                    // ALL-NEXT:    1| [[@LINE]]|}
 // after coverage    // ALL-NEXT:     | [[@LINE]]|// after
                      // FILTER-NOT:   | [[@LINE-1]]|// after
+
+// Test html output.
+// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence %s -format html -o %t.html.dir
+// RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence -name=_Z4funcIbEiT_ %s -format html -o %t.html.dir
+// RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-ALL -input-file=%t.html.dir/coverage/tmp/showTemplateInstantiations.cpp.html %s
+// RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-FILTER -input-file=%t.html.dir/functions.html %s
+
+// HTML-ALL: 
[[@LINE-44]]
// before
+// HTML-FILTER-NOT: 
[[@LINE-45]]
// before
+// HTML-ALL: 
[[@LINE-44]]
template<typename T>
+// HTML-ALL: 
2
[[@LINE-44]]
int func(T x) {
+// HTML-ALL: 
2
[[@LINE-44]]
  if(x)
+// HTML-ALL: 
1
[[@LINE-44]]
    ret
+// HTML-ALL: 
2
[[@LINE-44]]
  else
+// HTML-ALL: 
1
[[@LINE-44]]
    ret
+// HTML-ALL: 
0
[[@LINE-44]]
+// HTML-ALL: 
2
[[@LINE-44]]
}
+
+// HTML-SHARED: 
_Z4funcIbEiT_
+// HTML-SHARED: "; +} + +void SourceCoverageViewHTML::renderLineSuffix(raw_ostream &OS, unsigned) { + // If this view has sub-views, renderLine() cannot close the view's cell. + // Take care of it here, after all sub-views have been rendered. + if (hasSubViews()) + OS << EndCodeTD; + OS << ""; +} + +void SourceCoverageViewHTML::renderViewDivider(raw_ostream &, unsigned) { + // The table-based output makes view dividers unnecessary. +} + +void SourceCoverageViewHTML::renderLine( + raw_ostream &OS, LineRef L, const coverage::CoverageSegment *WrappedSegment, + CoverageSegmentArray Segments, unsigned ExpansionCol, unsigned) { + StringRef Line = L.Line; + + // Steps for handling text-escaping, highlighting, and tooltip creation: + // + // 1. Split the line into N+1 snippets, where N = |Segments|. The first + // snippet starts from Col=1 and ends at the start of the first segment. + // The last snippet starts at the last mapped column in the line and ends + // at the end of the line. Both are required but may be empty. + + SmallVector Snippets; + + unsigned LCol = 1; + auto Snip = [&](unsigned Start, unsigned Len) { + assert(Start + Len <= Line.size() && "Snippet extends past the EOL"); + Snippets.push_back(Line.substr(Start, Len)); + LCol += Len; + }; + + Snip(LCol - 1, Segments.empty() ? 0 : (Segments.front()->Col - 1)); + + for (unsigned I = 1, E = Segments.size(); I < E; ++I) { + assert(LCol == Segments[I - 1]->Col && "Snippet start position is wrong"); + Snip(LCol - 1, Segments[I]->Col - LCol); + } + + // |Line| + 1 is needed to avoid underflow when, e.g |Line| = 0 and LCol = 1. + Snip(LCol - 1, Line.size() + 1 - LCol); + assert(LCol == Line.size() + 1 && "Final snippet doesn't reach the EOL"); + + // 2. Escape all of the snippets. + + for (unsigned I = 0, E = Snippets.size(); I < E; ++I) + Snippets[I] = escape(Snippets[I]); + + // 3. Use \p WrappedSegment to set the highlight for snippets 0 and 1. Use + // segment 1 to set the highlight for snippet 2, segment 2 to set the + // highlight for snippet 3, and so on. + + Optional Color; + auto Highlight = [&](const std::string &Snippet) { + return tag("span", Snippet, Color.getValue()); + }; + + auto CheckIfUncovered = [](const coverage::CoverageSegment *S) { + return S && S->HasCount && S->Count == 0; + }; + + if (CheckIfUncovered(WrappedSegment) || + CheckIfUncovered(Segments.empty() ? nullptr : Segments.front())) { + Color = "red"; + Snippets[0] = Highlight(Snippets[0]); + Snippets[1] = Highlight(Snippets[1]); + } + + for (unsigned I = 1, E = Segments.size(); I < E; ++I) { + const auto *CurSeg = Segments[I]; + if (CurSeg->Col == ExpansionCol) + Color = "cyan"; + else if (CheckIfUncovered(CurSeg)) + Color = "red"; + else + Color = None; + + if (Color.hasValue()) + Snippets[I + 1] = Highlight(Snippets[I + 1]); + } + + // 4. Snippets[1:N+1] correspond to \p Segments[0:N]: use these to generate + // sub-line region count tooltips if needed. + + bool HasMultipleRegions = [&] { + unsigned RegionCount = 0; + for (const auto *S : Segments) + if (S->HasCount && S->IsRegionEntry) + if (++RegionCount > 1) + return true; + return false; + }(); + + if (shouldRenderRegionMarkers(HasMultipleRegions)) { + for (unsigned I = 0, E = Segments.size(); I < E; ++I) { + const auto *CurSeg = Segments[I]; + if (!CurSeg->IsRegionEntry || !CurSeg->HasCount) + continue; + + Snippets[I + 1] = + tag("div", Snippets[I + 1] + tag("span", formatCount(CurSeg->Count), + "tooltip-content"), + "tooltip"); + } + } + + OS << BeginCodeTD; + OS << BeginPre; + for (const auto &Snippet : Snippets) + OS << Snippet; + OS << EndPre; + + // If there are no sub-views left to attach to this cell, end the cell. + // Otherwise, end it after the sub-views are rendered (renderLineSuffix()). + if (!hasSubViews()) + OS << EndCodeTD; +} + +void SourceCoverageViewHTML::renderLineCoverageColumn( + raw_ostream &OS, const LineCoverageStats &Line) { + std::string Count = ""; + if (Line.isMapped()) + Count = tag("pre", formatCount(Line.ExecutionCount)); + std::string CoverageClass = + (Line.ExecutionCount > 0) ? "covered-line" : "uncovered-line"; + OS << tag("td", Count, CoverageClass); +} + +void SourceCoverageViewHTML::renderLineNumberColumn(raw_ostream &OS, + unsigned LineNo) { + OS << tag("td", tag("pre", utostr(uint64_t(LineNo))), "line-number"); +} + +void SourceCoverageViewHTML::renderRegionMarkers(raw_ostream &, + CoverageSegmentArray, + unsigned) { + // Region markers are rendered in-line using tooltips. +} + +void SourceCoverageViewHTML::renderExpansionSite( + raw_ostream &OS, LineRef L, const coverage::CoverageSegment *WrappedSegment, + CoverageSegmentArray Segments, unsigned ExpansionCol, unsigned ViewDepth) { + // Render the line containing the expansion site. No extra formatting needed. + renderLine(OS, L, WrappedSegment, Segments, ExpansionCol, ViewDepth); +} + +void SourceCoverageViewHTML::renderExpansionView(raw_ostream &OS, + ExpansionView &ESV, + unsigned ViewDepth) { + OS << BeginExpansionDiv; + ESV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/false, + ViewDepth + 1); + OS << EndExpansionDiv; +} + +void SourceCoverageViewHTML::renderInstantiationView(raw_ostream &OS, + InstantiationView &ISV, + unsigned ViewDepth) { + OS << BeginExpansionDiv; + ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true, ViewDepth); + OS << EndExpansionDiv; +}
1
[[@LINE-53]]
int func(T x) {
+// HTML-SHARED: 
1
[[@LINE-53]]
  if(x)
+// HTML-SHARED: 
1
[[@LINE-53]]
    ret
+// HTML-SHARED: 
1
[[@LINE-53]]
  else
+// HTML-SHARED: 
0
[[@LINE-53]]
+// HTML-SHARED: 
0
[[@LINE-53]]
+// HTML-SHARED: 
1
[[@LINE-53]]
}
+
+// HTML-ALL: 
_Z4funcIiEiT_
+// HTML-FILTER-NOT:
_Z4funcIiEiT_
+// HTML-ALL: "; + +const char *BeginPre = "
";
+
+const char *EndPre = "
"; + +const char *BeginExpansionDiv = "
"; + +const char *EndExpansionDiv = "
"; + +const char *BeginTable = "
1
[[@LINE-63]]
int func(T x) {
+// HTML-ALL: 
1
[[@LINE-63]]
  if(x)
+// HTML-ALL: 
0
[[@LINE-63]]
+// HTML-ALL: 
1
[[@LINE-63]]
  else
+// HTML-ALL: 
1
[[@LINE-63]]
    ret
+// HTML-ALL: 
0
[[@LINE-63]]
+// HTML-ALL: 
1
[[@LINE-63]]
}
+
+// HTML-ALL: td class='covered-line'>
1
[[@LINE-44]]
int main() {
+// HTML-ALL: 
1
[[@LINE-44]]
  func<int>(0);
+// HTML-ALL: 
1
[[@LINE-44]]
  func<bool>(true);
+// HTML-ALL: 
1
[[@LINE-44]]
  return 0;
+// HTML-ALL: 
1
[[@LINE-44]]
}
+
+// HTML-ALL: 
[[@LINE-45]]
// after
+// HTML-FILTER-NOT: 
[[@LINE-46]]
// after
Index: llvm/trunk/tools/llvm-cov/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-cov/CMakeLists.txt
+++ llvm/trunk/tools/llvm-cov/CMakeLists.txt
@@ -8,6 +8,7 @@
   CoverageReport.cpp
   CoverageSummaryInfo.cpp
   SourceCoverageView.cpp
+  SourceCoverageViewHTML.cpp
   SourceCoverageViewText.cpp
   TestingSupport.cpp
   )
Index: llvm/trunk/tools/llvm-cov/CodeCoverage.cpp
===================================================================
--- llvm/trunk/tools/llvm-cov/CodeCoverage.cpp
+++ llvm/trunk/tools/llvm-cov/CodeCoverage.cpp
@@ -272,6 +272,8 @@
       "format", cl::desc("Output format for line-based coverage reports"),
       cl::values(clEnumValN(CoverageViewOptions::OutputFormat::Text, "text",
                             "Text output"),
+                 clEnumValN(CoverageViewOptions::OutputFormat::HTML, "html",
+                            "HTML output"),
                  clEnumValEnd),
       cl::init(CoverageViewOptions::OutputFormat::Text));
 
@@ -333,6 +335,11 @@
                             ? sys::Process::StandardOutHasColors()
                             : UseColor == cl::BOU_TRUE;
       break;
+    case CoverageViewOptions::OutputFormat::HTML:
+      if (UseColor == cl::BOU_FALSE)
+        error("Color output cannot be disabled when generating html.");
+      ViewOpts.Colors = true;
+      break;
     }
 
     // Create the function filters
@@ -527,6 +534,9 @@
   if (Err)
     return Err;
 
+  if (ViewOpts.Format == CoverageViewOptions::OutputFormat::HTML)
+    error("HTML output for summary reports is not yet supported.");
+
   auto Coverage = load();
   if (!Coverage)
     return 1;
Index: llvm/trunk/tools/llvm-cov/CoverageViewOptions.h
===================================================================
--- llvm/trunk/tools/llvm-cov/CoverageViewOptions.h
+++ llvm/trunk/tools/llvm-cov/CoverageViewOptions.h
@@ -17,7 +17,8 @@
 /// \brief The options for displaying the code coverage information.
 struct CoverageViewOptions {
   enum class OutputFormat {
-    Text
+    Text,
+    HTML
   };
 
   bool Debug;
Index: llvm/trunk/tools/llvm-cov/SourceCoverageView.cpp
===================================================================
--- llvm/trunk/tools/llvm-cov/SourceCoverageView.cpp
+++ llvm/trunk/tools/llvm-cov/SourceCoverageView.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SourceCoverageView.h"
+#include "SourceCoverageViewHTML.h"
 #include "SourceCoverageViewText.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
@@ -74,6 +75,8 @@
   switch (Opts.Format) {
   case CoverageViewOptions::OutputFormat::Text:
     return llvm::make_unique(Opts);
+  case CoverageViewOptions::OutputFormat::HTML:
+    return llvm::make_unique(Opts);
   }
   llvm_unreachable("Unknown coverage output format!");
 }
@@ -111,6 +114,9 @@
   case CoverageViewOptions::OutputFormat::Text:
     return llvm::make_unique(SourceName, File, Options,
                                                      std::move(CoverageInfo));
+  case CoverageViewOptions::OutputFormat::HTML:
+    return llvm::make_unique(SourceName, File, Options,
+                                                     std::move(CoverageInfo));
   }
   llvm_unreachable("Unknown coverage output format!");
 }
Index: llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.h
===================================================================
--- llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.h
+++ llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.h
@@ -0,0 +1,83 @@
+//===- SourceCoverageViewHTML.h - A html code coverage view ---------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file This file defines the interface to the html coverage renderer.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_COV_SOURCECOVERAGEVIEWHTML_H
+#define LLVM_COV_SOURCECOVERAGEVIEWHTML_H
+
+#include "SourceCoverageView.h"
+
+namespace llvm {
+
+/// \brief A coverage printer for html output.
+class CoveragePrinterHTML : public CoveragePrinter {
+public:
+  Expected createViewFile(StringRef Path,
+                                       bool InToplevel) override;
+
+  void closeViewFile(OwnedStream OS) override;
+
+  Error createIndexFile(ArrayRef SourceFiles) override;
+
+  CoveragePrinterHTML(const CoverageViewOptions &Opts)
+      : CoveragePrinter(Opts) {}
+};
+
+/// \brief A code coverage view which supports html-based rendering.
+class SourceCoverageViewHTML : public SourceCoverageView {
+  void renderViewHeader(raw_ostream &OS) override;
+
+  void renderViewFooter(raw_ostream &OS) override;
+
+  void renderSourceName(raw_ostream &OS) override;
+
+  void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth) override;
+
+  void renderLineSuffix(raw_ostream &OS, unsigned ViewDepth) override;
+
+  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 renderExpansionSite(raw_ostream &OS, LineRef L,
+                           const coverage::CoverageSegment *WrappedSegment,
+                           CoverageSegmentArray Segments, unsigned ExpansionCol,
+                           unsigned ViewDepth) override;
+
+  void renderExpansionView(raw_ostream &OS, ExpansionView &ESV,
+                           unsigned ViewDepth) override;
+
+  void renderInstantiationView(raw_ostream &OS, InstantiationView &ISV,
+                               unsigned ViewDepth) override;
+
+  void renderLineCoverageColumn(raw_ostream &OS,
+                                const LineCoverageStats &Line) override;
+
+  void renderLineNumberColumn(raw_ostream &OS, unsigned LineNo) override;
+
+  void renderRegionMarkers(raw_ostream &OS, CoverageSegmentArray Segments,
+                           unsigned ViewDepth) override;
+
+public:
+  SourceCoverageViewHTML(StringRef SourceName, const MemoryBuffer &File,
+                         const CoverageViewOptions &Options,
+                         coverage::CoverageData &&CoverageInfo)
+      : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo)) {
+  }
+};
+
+} // namespace llvm
+
+#endif // LLVM_COV_SOURCECOVERAGEVIEWHTML_H
Index: llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.cpp
===================================================================
--- llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.cpp
+++ llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.cpp
@@ -0,0 +1,436 @@
+//===- SourceCoverageViewHTML.cpp - A html code coverage view -------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file This file implements the html coverage renderer.
+///
+//===----------------------------------------------------------------------===//
+
+#include "SourceCoverageViewHTML.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/Path.h"
+
+using namespace llvm;
+
+namespace {
+
+const char *BeginHeader =
+  ""
+    ""
+    "";
+
+const char *CSSForCoverage =
+  "";
+
+const char *EndHeader = "";
+
+const char *BeginCenteredDiv = "
"; + +const char *EndCenteredDiv = "
"; + +const char *BeginSourceNameDiv = "
"; + +const char *EndSourceNameDiv = "
"; + +const char *BeginCodeTD = "
"; + +const char *EndCodeTD = "
"; + +const char *EndTable = "
"; + +void emitPrelude(raw_ostream &OS) { + OS << "" + "" + << BeginHeader << CSSForCoverage << EndHeader << "" + << BeginCenteredDiv; +} + +void emitEpilog(raw_ostream &OS) { + OS << EndCenteredDiv << "" + ""; +} + +// Return a string with the special characters in \p Str escaped. +std::string escape(StringRef Str) { + std::string Result; + for (char C : Str) { + if (C == '&') + Result += "&"; + else if (C == '<') + Result += "<"; + else if (C == '>') + Result += ">"; + else if (C == '\"') + Result += """; + else + Result += C; + } + return Result; +} + +// Create a \p Name tag around \p Str, and optionally set its \p ClassName. +std::string tag(const std::string &Name, const std::string &Str, + const std::string &ClassName = "") { + std::string Tag = "<" + Name; + if (ClassName != "") + Tag += " class='" + ClassName + "'"; + return Tag + ">" + Str + ""; +} + +// Create an anchor to \p Link with the label \p Str. +std::string a(const std::string &Link, const std::string &Str) { + return "" + Str + ""; +} + +} // anonymous namespace + +Expected +CoveragePrinterHTML::createViewFile(StringRef Path, bool InToplevel) { + auto OSOrErr = createOutputStream(Path, "html", InToplevel); + if (!OSOrErr) + return OSOrErr; + + OwnedStream OS = std::move(OSOrErr.get()); + emitPrelude(*OS.get()); + return std::move(OS); +} + +void CoveragePrinterHTML::closeViewFile(OwnedStream OS) { + emitEpilog(*OS.get()); +} + +Error CoveragePrinterHTML::createIndexFile(ArrayRef SourceFiles) { + auto OSOrErr = createOutputStream("index", "html", /*InToplevel=*/true); + if (Error E = OSOrErr.takeError()) + return E; + auto OS = std::move(OSOrErr.get()); + raw_ostream &OSRef = *OS.get(); + + // Emit a table containing links to reports for each file in the covmapping. + emitPrelude(OSRef); + OSRef << BeginSourceNameDiv << "Index" << EndSourceNameDiv; + OSRef << BeginTable; + for (StringRef SF : SourceFiles) { + std::string LinkText = escape(sys::path::relative_path(SF)); + std::string LinkTarget = + escape(getOutputPath(SF, "html", /*InToplevel=*/false)); + OSRef << tag("tr", tag("td", tag("pre", a(LinkTarget, LinkText), "code"))); + } + OSRef << EndTable; + emitEpilog(OSRef); + + return Error::success(); +} + +void SourceCoverageViewHTML::renderViewHeader(raw_ostream &OS) { + OS << BeginTable; +} + +void SourceCoverageViewHTML::renderViewFooter(raw_ostream &OS) { + OS << EndTable; +} + +void SourceCoverageViewHTML::renderSourceName(raw_ostream &OS) { + OS << BeginSourceNameDiv << tag("pre", escape(getSourceName())) + << EndSourceNameDiv; +} + +void SourceCoverageViewHTML::renderLinePrefix(raw_ostream &OS, unsigned) { + OS << "