Fix skip_unimplemented for filetype=obj in ARM.

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 80 matching lines @@
 void InstARM32::startNextInst(const Cfg *Func) const {
   if (auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>())
     Asm->incEmitTextSize(InstSize);
 }
 
 void InstARM32::emitUsingTextFixup(const Cfg *Func) const {
   if (!BuildDefs::dump())
     return;
   GlobalContext *Ctx = Func->getContext();
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
+  if (Ctx->getFlags().getDisableHybridAssembly() &&
+      Ctx->getFlags().getSkipUnimplemented()) {
+    Asm->trap();
+    Asm->resetNeedsTextFixup();
+    return;
+  }
   std::string Buffer;
   llvm::raw_string_ostream StrBuf(Buffer);
   OstreamLocker L(Ctx);
   Ostream &OldStr = Ctx->getStrEmit();
   Ctx->setStrEmit(StrBuf);
   // Start counting instructions here, so that emit() methods don't
   // need to call this for the first instruction.
   Asm->resetEmitTextSize();
   Asm->incEmitTextSize(InstSize);
   emit(Func);
   Ctx->setStrEmit(OldStr);
   if (Ctx->getFlags().getDisableHybridAssembly()) {
     if (Ctx->getFlags().getSkipUnimplemented()) {
       Asm->trap();
     } else {
       llvm::errs() << "Can't assemble: " << StrBuf.str() << "\n";
       UnimplementedError(Ctx->getFlags());
     }
+    Asm->resetNeedsTextFixup();
     return;
   }
   Asm->emitTextInst(StrBuf.str(), Asm->getEmitTextSize());
 }
 
 void InstARM32::emitIAS(const Cfg *Func) const { emitUsingTextFixup(Func); }
 
 void InstARM32Pred::emitUnaryopGPR(const char *Opcode,
                                    const InstARM32Pred *Inst, const Cfg *Func,
                                    bool NeedsWidthSuffix) {
@@ skipping 599 matching lines @@
   }
 }
 
 template <> void InstARM32Vmul::emitIAS(const Cfg *Func) const {
   auto *Asm = Func->getAssembler<ARM32::AssemblerARM32>();
   const Variable *Dest = getDest();
   switch (Dest->getType()) {
   default:
     // TODO(kschimpf) Figure if more cases are needed.
     emitUsingTextFixup(Func);
-    break;
+    return;
   case IceType_f32:
     Asm->vmuls(getDest(), getSrc(0), getSrc(1), CondARM32::AL);
     assert(!Asm->needsTextFixup());
-    break;
+    return;
   case IceType_f64:
     Asm->vmuld(getDest(), getSrc(0), getSrc(1), CondARM32::AL);
     assert(!Asm->needsTextFixup());
-    break;
+    return;
   }
-  assert(!Asm->needsTextFixup());
 }
 
 InstARM32Call::InstARM32Call(Cfg *Func, Variable *Dest, Operand *CallTarget)
     : InstARM32(Func, InstARM32::Call, 1, Dest) {
   HasSideEffects = true;
   addSource(CallTarget);
 }
 
 InstARM32Label::InstARM32Label(Cfg *Func, TargetARM32 *Target)
     : InstARM32(Func, InstARM32::Label, 0, nullptr),
@@ skipping 1701 matching lines @@
 
 template class InstARM32FourAddrGPR<InstARM32::Mla>;
 template class InstARM32FourAddrGPR<InstARM32::Mls>;
 
 template class InstARM32CmpLike<InstARM32::Cmn>;
 template class InstARM32CmpLike<InstARM32::Cmp>;
 template class InstARM32CmpLike<InstARM32::Tst>;
 
 } // end of namespace ARM32
 } // end of namespace Ice