Rearrange emit vs emitIAS. Wait till function is done before dumping text.

src/IceCfgNode.cpp

 //===- subzero/src/IceCfgNode.cpp - Basic block (node) implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the CfgNode class, including the complexities
@@ skipping 846 matching lines @@
           else
             Str << ",";
           Var->emit(Func);
           First = false;
         }
       }
     }
   }
 }
 
+void updateStats(Cfg *Func, const Inst *I) {
+  // Update emitted instruction count, plus fill/spill count for
+  // Variable operands without a physical register.
+  if (uint32_t Count = I->getEmitInstCount()) {
+    Func->getContext()->statsUpdateEmitted(Count);
+    if (Variable *Dest = I->getDest()) {
+      if (!Dest->hasReg())
+        Func->getContext()->statsUpdateFills();
+    }
+    for (SizeT S = 0; S < I->getSrcSize(); ++S) {
+      if (Variable *Src = llvm::dyn_cast<Variable>(I->getSrc(S))) {
+        if (!Src->hasReg())
+          Func->getContext()->statsUpdateSpills();
+      }
+    }
+  }
+}
+
 } // end of anonymous namespace
 
 void CfgNode::emit(Cfg *Func) const {
   Func->setCurrentNode(this);
   Ostream &Str = Func->getContext()->getStrEmit();
   Liveness *Liveness = Func->getLiveness();
   bool DecorateAsm = Liveness && Func->getContext()->getFlags().DecorateAsm;
-  if (Func->getEntryNode() == this) {
-    Str << Func->getContext()->mangleName(Func->getFunctionName()) << ":\n";
-  }
   Str << getAsmName() << ":\n";
-  if (Func->useIntegratedAssembler()) {
-    Assembler *Asm = Func->getAssembler<Assembler>();
-    Asm->BindCfgNodeLabel(getIndex());
-  }
   std::vector<SizeT> LiveRegCount(Func->getTarget()->getNumRegisters());
   if (DecorateAsm)
     emitRegisterUsage(Str, Func, this, true, LiveRegCount);
 
   for (InstPhi *Phi : Phis) {
     if (Phi->isDeleted())
       continue;
     // Emitting a Phi instruction should cause an error.
     Inst *Instr = Phi;
     Instr->emit(Func);
   }
   for (Inst *I : Insts) {
     if (I->isDeleted())
       continue;
     if (I->isRedundantAssign()) {
       Variable *Dest = I->getDest();
       if (DecorateAsm && Dest->hasReg() && !I->isLastUse(I->getSrc(0)))
         ++LiveRegCount[Dest->getRegNum()];
       continue;
     }
-    if (Func->useIntegratedAssembler()) {
-      I->emitIAS(Func);
-    } else {
-      I->emit(Func);
-      if (DecorateAsm)
-        emitLiveRangesEnded(Str, Func, I, LiveRegCount);
-      Str << "\n";
-    }
-    // Update emitted instruction count, plus fill/spill count for
-    // Variable operands without a physical register.
-    if (uint32_t Count = I->getEmitInstCount()) {
-      Func->getContext()->statsUpdateEmitted(Count);
-      if (Variable *Dest = I->getDest()) {
-        if (!Dest->hasReg())
-          Func->getContext()->statsUpdateFills();
-      }
-      for (SizeT S = 0; S < I->getSrcSize(); ++S) {
-        if (Variable *Src = llvm::dyn_cast<Variable>(I->getSrc(S))) {
-          if (!Src->hasReg())
-            Func->getContext()->statsUpdateSpills();
-        }
-      }
-    }
+    I->emit(Func);
+    if (DecorateAsm)
+      emitLiveRangesEnded(Str, Func, I, LiveRegCount);
+    Str << "\n";
+    updateStats(Func, I);
   }
   if (DecorateAsm)
     emitRegisterUsage(Str, Func, this, false, LiveRegCount);
 }
 
+void CfgNode::emitIAS(Cfg *Func) const {
+  Func->setCurrentNode(this);
+  Assembler *Asm = Func->getAssembler<Assembler>();
+  Asm->BindCfgNodeLabel(getIndex());
+  for (InstPhi *Phi : Phis) {
+    if (Phi->isDeleted())
+      continue;
+    // Emitting a Phi instruction should cause an error.
+    Inst *Instr = Phi;
+    Instr->emitIAS(Func);
+  }
+  for (Inst *I : Insts) {
+    if (I->isDeleted())
+      continue;
+    if (I->isRedundantAssign())
+      continue;
+    I->emitIAS(Func);
+    updateStats(Func, I);
+  }
+}
+
 void CfgNode::dump(Cfg *Func) const {
   Func->setCurrentNode(this);
   Ostream &Str = Func->getContext()->getStrDump();
   Liveness *Liveness = Func->getLiveness();
   if (Func->getContext()->isVerbose(IceV_Instructions)) {
     Str << getName() << ":\n";
   }
   // Dump list of predecessor nodes.
   if (Func->getContext()->isVerbose(IceV_Preds) && !InEdges.empty()) {
     Str << "    // preds = ";
@@ skipping 57 matching lines @@
       if (!First)
         Str << ", ";
       First = false;
       Str << "%" << I->getName();
     }
     Str << "\n";
   }
 }
 
 } // end of namespace Ice