draperlaboratory · arunthomas · Jun 13, 2019 · Jun 13, 2019 · Jun 19, 2019 · Oct 3, 2019
diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -1599,7 +1599,7 @@ const MCExpr *TargetLoweringObjectFileCOFF::lowerRelativeReference(
 static std::string APIntToHexString(const APInt &AI) {
   unsigned Width = (AI.getBitWidth() / 8) * 2;
   std::string HexString = AI.toString(16, /*Signed=*/false);
-  transform(HexString.begin(), HexString.end(), HexString.begin(), tolower);
+  transform(HexString, HexString.begin(), ::tolower);
   unsigned Size = HexString.size();
   assert(Width >= Size && "hex string is too large!");
   HexString.insert(HexString.begin(), Width - Size, '0');

diff --git a/llvm/lib/Target/RISCV/ISPAsmPrinter.cpp b/llvm/lib/Target/RISCV/ISPAsmPrinter.cpp
@@ -17,6 +17,7 @@
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/Support/TargetRegistry.h"
+#include "TargetInfo/RISCVTargetInfo.h"
 
 #include "ISP.h"
 

diff --git a/llvm/lib/Target/RISCV/RISCVAsmPrinter.h b/llvm/lib/Target/RISCV/RISCVAsmPrinter.h
@@ -17,11 +17,15 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/CodeGen/AsmPrinter.h"
+#include "llvm/ADT/Statistic.h"
 
 #define DEBUG_TYPE "asm-printer"
 
 using namespace llvm;
 
+STATISTIC(RISCVNumInstrsCompressed,
+          "Number of RISC-V Compressed instructions emitted");
+
 class RISCVAsmPrinter : public AsmPrinter {
 public:
   explicit RISCVAsmPrinter(TargetMachine &TM,