Index: lib/Bitcode/NaCl/TestUtils/NaClBitcodeMungeWriter.cpp |
diff --git a/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMungeWriter.cpp b/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMungeWriter.cpp |
index 13b396955f8dc9e22c6e086815306aff736eb035..bb2261c80f786ae96f1bdd8550fe6205ee421c91 100644 |
--- a/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMungeWriter.cpp |
+++ b/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMungeWriter.cpp |
@@ -404,6 +404,11 @@ bool WriteState::emitRecord(NaClBitstreamWriter &Writer, |
markCurrentBlockWithOmittedAbbreviations(); |
return Flags.getTryToRecover(); |
} |
+ if (atOutermostScope()) { |
+ RecoverableError() << "Abbreviation definition not in block: " |
+ << Record << "\n"; |
+ return Flags.getTryToRecover(); |
+ } |
if (getCurWriteBlockID() == naclbitc::BLOCKINFO_BLOCK_ID) { |
Writer.EmitBlockInfoAbbrev(SetBID, Abbrev); |
} else { |