From bcd41c02dde44879b1bf1521ad60be33e8934404 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 13 Oct 2015 16:48:55 +0000 Subject: [PATCH] BitcodeReader: Remove ilist iterator implicit conversions, NFC Get LLVMBitReader building without relying on `ilist_iterator` implicit conversions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250181 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bitcode/Reader/BitcodeReader.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index fb853b59844..604cbe37c64 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -2866,7 +2866,7 @@ std::error_code BitcodeReader::parseConstants() { return error("Invalid ID"); ++BBI; } - BB = BBI; + BB = &*BBI; } else { // Otherwise insert a placeholder and remember it so it can be inserted // when the function is parsed. @@ -3720,8 +3720,8 @@ std::error_code BitcodeReader::parseFunctionBody(Function *F) { unsigned ModuleMDValueListSize = MDValueList.size(); // Add all the function arguments to the value table. - for(Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; ++I) - ValueList.push_back(I); + for (Argument &I : F->args()) + ValueList.push_back(&I); unsigned NextValueNo = ValueList.size(); BasicBlock *CurBB = nullptr; @@ -5103,9 +5103,8 @@ std::error_code BitcodeReader::materializeModule(Module *M) { // Iterate over the module, deserializing any functions that are still on // disk. - for (Module::iterator F = TheModule->begin(), E = TheModule->end(); - F != E; ++F) { - if (std::error_code EC = materialize(F)) + for (Function &F : *TheModule) { + if (std::error_code EC = materialize(&F)) return EC; } // At this point, if there are any function bodies, parse the rest of -- 2.34.1