commit 83228137e16c0d7fe33eaceddf6f67115d45338f
author Diego Novillo <dnovillo@google.com> Mon Nov 27 10:16:41 2017 -0500
committer Diego Novillo <dnovillo@google.com> Mon Nov 27 14:31:49 2017 -0500
tree a1e2082ec253fe61242c8eeea91943e00a7270d2
parent d8b2013ecfd6603855752452bb3a280a7b515d2c

Re-format source tree - NFC.

Re-formatted the source tree with the command:

$ /usr/bin/clang-format -style=file -i \
    $(find include source tools test utils -name '*.cpp' -or -name '*.h')

This required a fix to source/val/decoration.h.  It was not including
spirv.h, which broke builds when the #include headers were re-ordered by
clang-format.

source/opt/inline_pass.cpp

diff --git a/source/opt/inline_pass.cpp b/source/opt/inline_pass.cpp
index f813f99..4b1ba58 100644
--- a/source/opt/inline_pass.cpp
+++ b/source/opt/inline_pass.cpp
@@ -146,7 +146,8 @@
     std::unique_ptr<ir::Instruction> var_inst(
         callee_var_itr->Clone(callee_var_itr->context()));
     uint32_t newId = TakeNextId();
-    get_decoration_mgr()->CloneDecorations(callee_var_itr->result_id(), newId, update_def_use_mgr_);
+    get_decoration_mgr()->CloneDecorations(callee_var_itr->result_id(), newId,
+                                           update_def_use_mgr_);
     var_inst->SetResultId(newId);
     (*callee2caller)[callee_var_itr->result_id()] = newId;
     new_vars->push_back(std::move(var_inst));
@@ -175,7 +176,8 @@
           {SpvStorageClassFunction}}}));
     new_vars->push_back(std::move(var_inst));
   }
-  get_decoration_mgr()->CloneDecorations(calleeFn->result_id(), returnVarId, update_def_use_mgr_);
+  get_decoration_mgr()->CloneDecorations(calleeFn->result_id(), returnVarId,
+                                         update_def_use_mgr_);
   return returnVarId;
 }
 
@@ -188,30 +190,30 @@
     std::unordered_map<uint32_t, uint32_t>* postCallSB,
     std::unordered_map<uint32_t, ir::Instruction*>* preCallSB,
     std::unique_ptr<ir::BasicBlock>* block_ptr) {
-  (*inst)->ForEachInId(
-      [&postCallSB, &preCallSB, &block_ptr, this](uint32_t* iid) {
-        const auto mapItr = (*postCallSB).find(*iid);
-        if (mapItr == (*postCallSB).end()) {
-          const auto mapItr2 = (*preCallSB).find(*iid);
-          if (mapItr2 != (*preCallSB).end()) {
-            // Clone pre-call same-block ops, map result id.
-            const ir::Instruction* inInst = mapItr2->second;
-            std::unique_ptr<ir::Instruction> sb_inst(
-                inInst->Clone(inInst->context()));
-            CloneSameBlockOps(&sb_inst, postCallSB, preCallSB, block_ptr);
-            const uint32_t rid = sb_inst->result_id();
-            const uint32_t nid = this->TakeNextId();
-            get_decoration_mgr()->CloneDecorations(rid, nid, update_def_use_mgr_);
-            sb_inst->SetResultId(nid);
-            (*postCallSB)[rid] = nid;
-            *iid = nid;
-            (*block_ptr)->AddInstruction(std::move(sb_inst));
-          }
-        } else {
-          // Reset same-block op operand.
-          *iid = mapItr->second;
-        }
-      });
+  (*inst)->ForEachInId([&postCallSB, &preCallSB, &block_ptr,
+                        this](uint32_t* iid) {
+    const auto mapItr = (*postCallSB).find(*iid);
+    if (mapItr == (*postCallSB).end()) {
+      const auto mapItr2 = (*preCallSB).find(*iid);
+      if (mapItr2 != (*preCallSB).end()) {
+        // Clone pre-call same-block ops, map result id.
+        const ir::Instruction* inInst = mapItr2->second;
+        std::unique_ptr<ir::Instruction> sb_inst(
+            inInst->Clone(inInst->context()));
+        CloneSameBlockOps(&sb_inst, postCallSB, preCallSB, block_ptr);
+        const uint32_t rid = sb_inst->result_id();
+        const uint32_t nid = this->TakeNextId();
+        get_decoration_mgr()->CloneDecorations(rid, nid, update_def_use_mgr_);
+        sb_inst->SetResultId(nid);
+        (*postCallSB)[rid] = nid;
+        *iid = nid;
+        (*block_ptr)->AddInstruction(std::move(sb_inst));
+      }
+    } else {
+      // Reset same-block op operand.
+      *iid = mapItr->second;
+    }
+  });
 }
 
 void InlinePass::GenInlineCode(
@@ -649,7 +651,7 @@
   InitializeProcessing(c);
 
   // Don't bother updating the DefUseManger
-  update_def_use_mgr_ = [this] (ir::Instruction&, bool) {};
+  update_def_use_mgr_ = [this](ir::Instruction&, bool) {};
 
   false_id_ = 0;