Fix textual emission of label instructions in ARM assembler.

src/IceInstARM32.cpp

 //===- subzero/src/IceInstARM32.cpp - ARM32 instruction implementation ----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 824 matching lines @@
         startNextInst(Func);
         Str << "\n\t"
             << "b"
             << "\t" << getTargetFalse()->getAsmName();
       }
     }
   }
 }
 
 void InstARM32Br::emitIAS(const Cfg *Func) const {
-  if (!Func->getContext()->getFlags().getAllowUnsafeIas())
-    return emitUsingTextFixup(Func);
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   if (Label) {
     Asm->b(Asm->getOrCreateLocalLabel(Label->getNumber()), getPredicate());
   } else if (isUnconditionalBranch()) {
     Asm->b(Asm->getOrCreateCfgNodeLabel(getTargetFalse()->getIndex()),
            getPredicate());
   } else {
     Asm->b(Asm->getOrCreateCfgNodeLabel(getTargetTrue()->getIndex()),
            getPredicate());
     if (const CfgNode *False = getTargetFalse())
@@ skipping 59 matching lines @@
     dumpDest(Func);
     Str << " = ";
   }
   Str << "call ";
   getCallTarget()->dump(Func);
 }
 
 void InstARM32Label::emit(const Cfg *Func) const {
   if (!BuildDefs::dump())
     return;
+  // A label is not really an instruction. Hence, we need to fix the
+  // emitted text size.
+  if (auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>())
+    Asm->decEmitTextSize(InstSize);
   Ostream &Str = Func->getContext()->getStrEmit();
   Str << getName(Func) << ":";
 }
 
 void InstARM32Label::emitIAS(const Cfg *Func) const {
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   Asm->bindLocalLabel(Func, this, Number);
   if (Asm->needsTextFixup())
     emitUsingTextFixup(Func);
 }
@@ skipping 82 matching lines @@
   Constant *Src0 = llvm::cast<Constant>(getSrc(0));
   if (auto *CR = llvm::dyn_cast<ConstantRelocatable>(Src0)) {
     Str << "#:lower16:";
     CR->emitWithoutPrefix(Func->getTarget());
   } else {
     Src0->emit(Func);
   }
 }
 
 template <> void InstARM32Movw::emitIAS(const Cfg *Func) const {
-  if (!Func->getContext()->getFlags().getAllowUnsafeIas())
-    return emitUsingTextFixup(Func);
   assert(getSrcSize() == 1);
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   Asm->movw(getDest(), getSrc(0), getPredicate());
   if (Asm->needsTextFixup())
     emitUsingTextFixup(Func);
 }
 
 template <> void InstARM32Movt::emit(const Cfg *Func) const {
   if (!BuildDefs::dump())
     return;
   Ostream &Str = Func->getContext()->getStrEmit();
   assert(getSrcSize() == 2);
   Variable *Dest = getDest();
   Constant *Src1 = llvm::cast<Constant>(getSrc(1));
   Str << "\t" << Opcode << getPredicate() << "\t";
   Dest->emit(Func);
   Str << ", ";
   if (auto *CR = llvm::dyn_cast<ConstantRelocatable>(Src1)) {
     Str << "#:upper16:";
     CR->emitWithoutPrefix(Func->getTarget());
   } else {
     Src1->emit(Func);
   }
 }
 
 template <> void InstARM32Movt::emitIAS(const Cfg *Func) const {
-  if (!Func->getContext()->getFlags().getAllowUnsafeIas())
-    return emitUsingTextFixup(Func);
   assert(getSrcSize() == 2);
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   Asm->movt(getDest(), getSrc(1), getPredicate());
   if (Asm->needsTextFixup())
     emitUsingTextFixup(Func);
 }
 
 void InstARM32Pop::emit(const Cfg *Func) const {
   // TODO(jpp): Improve FP register save/restore.
   if (!BuildDefs::dump())
@@ skipping 559 matching lines @@
 template class InstARM32UnaryopGPR<InstARM32::Uxt, true>;
 template class InstARM32UnaryopFP<InstARM32::Vsqrt>;
 
 template class InstARM32FourAddrGPR<InstARM32::Mla>;
 template class InstARM32FourAddrGPR<InstARM32::Mls>;
 
 template class InstARM32CmpLike<InstARM32::Cmp>;
 template class InstARM32CmpLike<InstARM32::Tst>;
 
 } // end of namespace Ice