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

src/assembler_ia32.h

 //===- subzero/src/assembler_ia32.h - Assembler for x86-32 ------*- C++ -*-===//
 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
 // Modified by the Subzero authors.
 //
 //===----------------------------------------------------------------------===//
 //
 //                        The Subzero Code Generator
@@ skipping 346 matching lines @@
   intptr_t unresolved_near_positions_[kMaxUnresolvedBranches];
 
   friend class AssemblerX86;
 };
 
 class AssemblerX86 : public Assembler {
   AssemblerX86(const AssemblerX86 &) = delete;
   AssemblerX86 &operator=(const AssemblerX86 &) = delete;
 
 public:
-  explicit AssemblerX86(bool use_far_branches = false) : buffer_(*this) {
+  explicit AssemblerX86(bool use_far_branches = false) : Assembler() {
     // This mode is only needed and implemented for MIPS and ARM.
     assert(!use_far_branches);
     (void)use_far_branches;
   }
   ~AssemblerX86() override;
 
   static const bool kNearJump = true;
   static const bool kFarJump = false;
 
   Label *GetOrCreateCfgNodeLabel(SizeT NodeNumber);
@@ skipping 444 matching lines @@
   intptr_t PreferredLoopAlignment() { return 16; }
   void Align(intptr_t alignment, intptr_t offset);
   void Bind(Label *label);
 
   intptr_t CodeSize() const { return buffer_.Size(); }
 
   void FinalizeInstructions(const MemoryRegion &region) {
     buffer_.FinalizeInstructions(region);
   }
 
-  // Expose the buffer, for bringup...
-  intptr_t GetPosition() const { return buffer_.GetPosition(); }
-  template <typename T> T LoadBuffer(intptr_t position) const {
-    return buffer_.Load<T>(position);
-  }
-  AssemblerFixup *GetLatestFixup(intptr_t position) const {
-    return buffer_.GetLatestFixup(position);
-  }
-
 private:
   inline void EmitUint8(uint8_t value);
   inline void EmitInt16(int16_t value);
   inline void EmitInt32(int32_t value);
   inline void EmitRegisterOperand(int rm, int reg);
   inline void EmitXmmRegisterOperand(int rm, XmmRegister reg);
   inline void EmitFixup(AssemblerFixup *fixup);
   inline void EmitOperandSizeOverride();
 
   void EmitOperand(int rm, const Operand &operand);
@@ skipping 10 matching lines @@
   void EmitGenericShift(int rm, Type Ty, const Operand &operand,
                         GPRRegister shifter);
 
   typedef std::vector<Label *> LabelVector;
   // A vector of pool-allocated x86 labels for CFG nodes.
   LabelVector CfgNodeLabels;
   // A vector of pool-allocated x86 labels for Local labels.
   LabelVector LocalLabels;
 
   Label *GetOrCreateLabel(SizeT Number, LabelVector &Labels);
-
-  AssemblerBuffer buffer_;
 };
 
 inline void AssemblerX86::EmitUint8(uint8_t value) {
   buffer_.Emit<uint8_t>(value);
 }
 
 inline void AssemblerX86::EmitInt16(int16_t value) {
   buffer_.Emit<int16_t>(value);
 }
 
@@ skipping 13 matching lines @@
 inline void AssemblerX86::EmitFixup(AssemblerFixup *fixup) {
   buffer_.EmitFixup(fixup);
 }
 
 inline void AssemblerX86::EmitOperandSizeOverride() { EmitUint8(0x66); }
 
 } // end of namespace x86
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ASSEMBLER_IA32_H_