Run clang-format

Author: ostannard

llvm/tools/llvm-objdump/SourcePrinter.cpp

@@ -508,12 +508,8 @@ SourcePrinter::SourcePrinter(const object::ObjectFile *Obj,
 
 // TODO Light/dark shades? 256-color terminals?
 const raw_ostream::Colors LineColors[] = {
-  raw_ostream::RED,
-  raw_ostream::GREEN,
-  raw_ostream::YELLOW,
-  raw_ostream::BLUE,
-  raw_ostream::MAGENTA,
-  raw_ostream::CYAN,
+    raw_ostream::RED,  raw_ostream::GREEN,   raw_ostream::YELLOW,
+    raw_ostream::BLUE, raw_ostream::MAGENTA, raw_ostream::CYAN,
 };
 
 raw_ostream::Colors ControlFlowPrinter::PickColor() {
@@ -528,7 +524,8 @@ raw_ostream::Colors ControlFlowPrinter::PickColor() {
 void ControlFlowPrinter::addEdge(uint64_t From, uint64_t To) {
   auto It = Targets.find(To);
   if (It == Targets.end())
-    It = Targets.insert(std::make_pair(To, ControlFlowTarget(To, PickColor()))).first;
+    It = Targets.insert(std::make_pair(To, ControlFlowTarget(To, PickColor())))
+             .first;
   It->second.addSource(From);
 }
 
@@ -559,7 +556,6 @@ void ControlFlowPrinter::finalise() {
         break;
     T->Column = Column;
     MaxColumn = std::max(MaxColumn, Column);
-
   }
 
   setControlFlowColumnWidth(MaxColumn * 2 + 4);

llvm/tools/llvm-objdump/SourcePrinter.h

@@ -180,7 +180,9 @@ struct VisualizeJumpsMode {
   VisualizeJumpsMode(Chars_t Chars, Colors_t Colors)
       : Chars(Chars), Colors(Colors) {}
 
-  static VisualizeJumpsMode GetDefault() { return VisualizeJumpsMode(Unicode, Auto); }
+  static VisualizeJumpsMode GetDefault() {
+    return VisualizeJumpsMode(Unicode, Auto);
+  }
 
   bool enabled() const { return Chars != Off; }
   bool color_enabled() const { return enabled() && Colors != BlackAndWhite; }
@@ -192,7 +194,6 @@ struct VisualizeJumpsMode {
   }
 };
 
-
 class ControlFlowPrinter {
   struct ControlFlowTarget {
     uint64_t Target;
@@ -201,7 +202,8 @@ class ControlFlowPrinter {
     raw_ostream::Colors Color;
 
     ControlFlowTarget(uint64_t Target, raw_ostream::Colors Color)
-        : Target(Target), Column(~0U), Color(Color), High(Target), Low(Target) {}
+        : Target(Target), Column(~0U), Color(Color), High(Target), Low(Target) {
+    }
     ControlFlowTarget(const ControlFlowTarget &) = delete;
     ControlFlowTarget(ControlFlowTarget &&) = default;
 

llvm/tools/llvm-objdump/llvm-objdump.cpp

@@ -509,7 +509,7 @@ unsigned objdump::GetColumnIndent(MCSubtargetInfo const &STI,
 
   // Encoding: depends on architecture
   if (ShowRawInsn)
-      Indent += EncodingColumnWidth(STI.getTargetTriple());
+    Indent += EncodingColumnWidth(STI.getTargetTriple());
 
   // Special case for assembly string: the assembly printer uses tabs, so we
   // need to ensure we start the instruction on a tab stop (multiple of 8).
@@ -542,7 +542,7 @@ void objdump::IndentToColumn(MCSubtargetInfo const &STI,
   if (Col == DisassemblyColumn::Assembly) {
     TargetIndent -= 1;
     if (TargetIndent < CurrentIndent)
-      TargetIndent =  alignTo(CurrentIndent + 1, 8) - 1;
+      TargetIndent = alignTo(CurrentIndent + 1, 8) - 1;
   }
 
   if (TargetIndent > CurrentIndent)
@@ -1358,14 +1358,12 @@ collectBBAddrMapLabels(const std::unordered_map<uint64_t, BBAddrMap> &AddrToBBAd
   }
 }
 
-static void
-collectLocalBranchTargets(ArrayRef<uint8_t> Bytes, MCInstrAnalysis *MIA,
-                          MCDisassembler *DisAsm, MCInstPrinter *IP,
-                          const MCSubtargetInfo *STI, uint64_t SectionAddr,
-                          uint64_t Start, uint64_t End,
-                          std::unordered_map<uint64_t, std::string> &Labels,
-                          ControlFlowPrinter &CFP,
-                          std::vector<RelocationRef> &Relocs) {
+static void collectLocalBranchTargets(
+    ArrayRef<uint8_t> Bytes, MCInstrAnalysis *MIA, MCDisassembler *DisAsm,
+    MCInstPrinter *IP, const MCSubtargetInfo *STI, uint64_t SectionAddr,
+    uint64_t Start, uint64_t End,
+    std::unordered_map<uint64_t, std::string> &Labels, ControlFlowPrinter &CFP,
+    std::vector<RelocationRef> &Relocs) {
   if (MIA)
     MIA->resetState();
 
@@ -1951,7 +1949,6 @@ disassembleObject(ObjectFile &Obj, const ObjectFile &DbgObj,
       Start -= SectionAddr;
       End -= SectionAddr;
 
-
       formatted_raw_ostream FOS(outs());
 
       if (!PrintedSection) {
@@ -3393,7 +3390,8 @@ static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
     if (DisassemblyColor == ColorOutput::Invalid)
       invalidArgValue(A);
   }
-  if (const opt::Arg *A = InputArgs.getLastArg(OBJDUMP_visualize_jumps, OBJDUMP_visualize_jumps_EQ)) {
+  if (const opt::Arg *A = InputArgs.getLastArg(OBJDUMP_visualize_jumps,
+                                               OBJDUMP_visualize_jumps_EQ)) {
     if (A->getOption().matches(OBJDUMP_visualize_jumps)) {
       // --visualize-jumps without an argument default to unicode, auto-color.
       VisualizeJumps = VisualizeJumpsMode::GetDefault();
@@ -3422,7 +3420,6 @@ static void parseObjdumpOptions(const llvm::opt::InputArgList &InputArgs) {
         }
       }
 
-
       VisualizeJumps = VisualizeJumpsMode(Chars, Color);
     }