Check that element type correct in vector insert element.

src/PNaClTranslator.cpp

 //===- subzero/src/PNaClTranslator.cpp - ICE from bitcode -----------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 2019 matching lines @@
     if (Ty == Ice::IceType_void)
       return;
     Ice::Variable *Var = getNextInstVar(Ty);
     CurrentNode->appendInst(Ice::InstAssign::create(Func.get(), Var, Var));
   }
 
   Ice::Operand *reportGetOperandUndefined(NaClBcIndexSize_t Index) {
     std::string Buffer;
     raw_string_ostream StrBuf(Buffer);
     StrBuf << "Value index " << Index << " not defined!";
-    Fatal(StrBuf.str());
+    Error(StrBuf.str());
+    // Recover and return some value.
+    if (!LocalOperands.empty())
+      return LocalOperands.front();
+    return Context->getGlobalConstantByID(0);
   }
 };
 
 void FunctionParser::ExitBlock() {
   // Check if the last instruction in the function was terminating.
   if (!InstIsTerminating) {
     Error("Last instruction in function not terminator");
     if (isIRGenerationDisabled())
       return;
     // Recover by inserting an unreachable instruction.
@@ skipping 230 matching lines @@
       std::string Buffer;
       raw_string_ostream StrBuf(Buffer);
       dumpVectorIndexCheckValue(StrBuf, IndexCheckValue);
       StrBuf << ": insertelement " << VecType << " " << *Vec << ", "
              << Elt->getType() << " " << *Elt << ", " << Index->getType() << " "
              << *Index;
       Error(StrBuf.str());
       appendErrorInstruction(Elt->getType());
       return;
     }
+    if (Ice::typeElementType(VecType) != Elt->getType()) {
+      std::string Buffer;
+      raw_string_ostream StrBuf(Buffer);
+      StrBuf << "Element type " << Ice::typeString(Elt->getType())

[Jim Stichnoth, 2015/09/21 21:39:54]

May want to use the string "insertelement" in the error message.  I think that
style is used elsewhere.

[Karl, 2015/09/21 22:32:46]

Done.

+             << " doesn't match vector type: " << Ice::typeString(VecType);
+      Error(StrBuf.str());
+      appendErrorInstruction(Elt->getType());
+      return;
+    }
     CurrentNode->appendInst(Ice::InstInsertElement::create(
         Func.get(), getNextInstVar(VecType), Vec, Elt, Index));
     return;
   }
   case naclbitc::FUNC_CODE_INST_CMP2: {
     // CMP2: [opval, opval, pred]
     if (!isValidRecordSize(3, "compare"))
       return;
     Ice::Operand *Op1 = getRelativeOperand(Values[0], BaseIndex);
     Ice::Operand *Op2 = getRelativeOperand(Values[1], BaseIndex);
@@ skipping 968 matching lines @@
   }
   if (InputStreamFile.getBitcodeBytes().getExtent() % 4 != 0) {
     ErrStream
         << IRFilename
         << ": Bitcode stream should be a multiple of 4 bytes in length.\n";
     llvm::report_fatal_error("Bitcode stream should be a multiple of 4 bytes");
   }
 }
 
 } // end of namespace Ice