Fix error reporting for parallel parsed function blocks.

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 764 matching lines @@
   // for unit tests.
   if (getFlags().getGenerateUnitTestMessages()) {
     StrBuf << "Invalid " << getBlockName() << " record: <" << Record.GetCode();
     for (const uint64_t Val : Record.GetValues()) {
       StrBuf << " " << Val;
     }
     StrBuf << ">";
   } else {
     StrBuf << Message;
   }
-  return Context->ErrorAt(Level, Bit, StrBuf.str());
+  return Context->ErrorAt(Level, Record.GetCursor().getErrorBitNo(Bit),
+                          StrBuf.str());
 }
 
 void BlockParserBaseClass::reportRecordSizeError(size_t ExpectedSize,
                                                  const char *RecordName,
                                                  const char *ContextMessage) {
   std::string Buffer;
   raw_string_ostream StrBuf(Buffer);
   const char *BlockName = getBlockName();
   const char FirstChar = toupper(*BlockName);
   StrBuf << FirstChar << (BlockName + 1) << " " << RecordName
@@ skipping 2311 matching lines @@
   // TODO(kschimpf): Fix this issue.
   ModuleParser *ModParser;
   const std::unique_ptr<uint8_t[]> Buffer;
   const uintptr_t BufferSize;
   const uint64_t StartBit;
   const uint32_t SeqNumber;
 };
 
 std::unique_ptr<Ice::Cfg> CfgParserWorkItem::getParsedCfg() {
   NaClBitstreamCursor &OldCursor(ModParser->getCursor());
-  llvm::NaClBitstreamReader Reader(Buffer.get(), Buffer.get() + BufferSize,
+  llvm::NaClBitstreamReader Reader(OldCursor.getStartWordByteForBit(StartBit),
+                                   Buffer.get(), Buffer.get() + BufferSize,
                                    OldCursor.getBitStreamReader());
   NaClBitstreamCursor NewCursor(Reader);
   NewCursor.JumpToBit(NewCursor.getWordBitNo(StartBit));
   FunctionParser Parser(BlockID, ModParser, FcnId, NewCursor);
   return Parser.parseFunction(SeqNumber);
 }
 
 bool ModuleParser::ParseBlock(unsigned BlockID) {
   switch (BlockID) {
   case naclbitc::BLOCKINFO_BLOCK_ID:
@@ skipping 173 matching lines @@
     raw_string_ostream StrBuf(Buffer);
     StrBuf << IRFilename << ": Does not contain a module!";
     llvm::report_fatal_error(StrBuf.str());
   }
   if (InputStreamFile.getBitcodeBytes().getExtent() % 4 != 0) {
     llvm::report_fatal_error("Bitcode stream should be a multiple of 4 bytes");
   }
 }
 
 } // end of namespace Ice