commit dd842dbb57b825ed0dd6400648d0602b74c90aff
author Jim Stichnoth <stichnot@chromium.org> Tue Jan 27 12:53:53 2015 -0800
committer Jim Stichnoth <stichnot@chromium.org> Tue Jan 27 12:53:53 2015 -0800
tree e79280629f8a03f538495bd2407c2de7f05430db
parent fa4efea5413aa993e8e6ba10579e0934d1a3e784

Subzero: Use a "known" version of clang-format.

There are two problems with "make format" and "make format-diff" in
Makefile.standalone:

1. You have to make sure clang-format and clang-format-diff.py are
available in $PATH.

2. Different users may have different versions installed (even for the
same user on different machines), leading to whitespace wars.  Can't we
all just get along?

Since the normal LLVM build that Subzero depends on also exposes and
builds clang-format and friends, we might as well use it.  The
clang-format binary is found in $LLVM_BIN_PATH, and clang-format-diff.py
is found relative to $LLVM_SRC_PATH.  As long as the user's LLVM build
is fairly up to date, whitespace wars are unlikely.

Given this, there's a much higher incentive to use "make format"
regularly instead of "make format-diff".  In particular, inline comments
on variable/field declaration lists can get lined up more nicely by
looking at the entire context, rather than the small diff window.

BUG= none
R=jvoung@chromium.org

Review URL: https://codereview.chromium.org/877003003

src/IceOperand.h

diff --git a/src/IceOperand.h b/src/IceOperand.h
index 3bbc0e3..5019e29 100644
--- a/src/IceOperand.h
+++ b/src/IceOperand.h
@@ -88,7 +88,7 @@
   Variable **Vars;
 };
 
-template<class StreamType>
+template <class StreamType>
 inline StreamType &operator<<(StreamType &Str, const Operand &Op) {
   Op.dump(Str);
   return Str;
@@ -170,7 +170,8 @@
 typedef ConstantPrimitive<float, Operand::kConstFloat> ConstantFloat;
 typedef ConstantPrimitive<double, Operand::kConstDouble> ConstantDouble;
 
-template <> inline void ConstantInteger32::dump(const Cfg *, Ostream &Str) const {
+template <>
+inline void ConstantInteger32::dump(const Cfg *, Ostream &Str) const {
   if (!ALLOW_DUMP)
     return;
   if (getType() == IceType_i1)
@@ -179,7 +180,8 @@
     Str << static_cast<int32_t>(getValue());
 }
 
-template <> inline void ConstantInteger64::dump(const Cfg *, Ostream &Str) const {
+template <>
+inline void ConstantInteger64::dump(const Cfg *, Ostream &Str) const {
   if (!ALLOW_DUMP)
     return;
   assert(getType() == IceType_i64);
@@ -244,7 +246,7 @@
         Name(Name), SuppressMangling(SuppressMangling) {}
   ~ConstantRelocatable() override {}
   const RelocOffsetT Offset; // fixed offset to add
-  const IceString Name; // optional for debug/dump
+  const IceString Name;      // optional for debug/dump
   bool SuppressMangling;
 };
 
@@ -360,7 +362,7 @@
   typedef std::pair<InstNumberT, InstNumberT> RangeElementType;
   // RangeType is arena-allocated from the Cfg's allocator.
   typedef std::vector<RangeElementType, CfgLocalAllocator<RangeElementType>>
-  RangeType;
+      RangeType;
   RangeType Range;
   RegWeight Weight;
   // TrimmedBegin is an optimization for the overlaps() computation.
@@ -540,11 +542,7 @@
     MDS_MultiDefSingleBlock,
     MDS_MultiDefMultiBlock
   };
-  enum MultiBlockState {
-    MBS_Unknown,
-    MBS_SingleBlock,
-    MBS_MultiBlock
-  };
+  enum MultiBlockState { MBS_Unknown, MBS_SingleBlock, MBS_MultiBlock };
   VariableTracking()
       : MultiDef(MDS_Unknown), MultiBlock(MBS_Unknown), SingleUseNode(nullptr),
         SingleDefNode(nullptr), FirstOrSingleDefinition(nullptr) {}