From b7a6aec4eeb4cbbc71d4747d2aa6d25dda41d5d1 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 23 Feb 2017 17:41:33 +0100 Subject: convert iterators using static_cast Newer versions of LLVM do not allow to implicitly cast iterators to pointers where they point. So convert all such uses to explicit static_cast, the same as LLVM code does. Otherwise we see errors like: lib/Core/Executor.cpp:548:15: error: no viable conversion from 'Module::iterator' (aka 'ilist_iterator') to 'llvm::Function *' Function *f = i; ^ ~ Signed-off-by: Jiri Slaby --- lib/Module/InstructionInfoTable.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/Module/InstructionInfoTable.cpp') diff --git a/lib/Module/InstructionInfoTable.cpp b/lib/Module/InstructionInfoTable.cpp index 7e9a9e26..adf05442 100644 --- a/lib/Module/InstructionInfoTable.cpp +++ b/lib/Module/InstructionInfoTable.cpp @@ -120,6 +120,7 @@ InstructionInfoTable::InstructionInfoTable(Module *m) for (Module::iterator fnIt = m->begin(), fn_ie = m->end(); fnIt != fn_ie; ++fnIt) { + Function *fn = static_cast(fnIt); // We want to ensure that as all instructions have source information, if // available. Clang sometimes will not write out debug information on the @@ -128,15 +129,14 @@ InstructionInfoTable::InstructionInfoTable(Module *m) // if any. const std::string *initialFile = &dummyString; unsigned initialLine = 0; - for (inst_iterator it = inst_begin(fnIt), ie = inst_end(fnIt); it != ie; - ++it) { + for (inst_iterator it = inst_begin(fn), ie = inst_end(fn); it != ie; ++it) { if (getInstructionDebugInfo(&*it, initialFile, initialLine)) break; } const std::string *file = initialFile; unsigned line = initialLine; - for (inst_iterator it = inst_begin(fnIt), ie = inst_end(fnIt); it != ie; + for (inst_iterator it = inst_begin(fn), ie = inst_end(fn); it != ie; ++it) { Instruction *instr = &*it; unsigned assemblyLine = lineTable[instr]; @@ -193,6 +193,6 @@ InstructionInfoTable::getFunctionInfo(const Function *f) const { // and construct a test case for it if it does, though. return dummyInfo; } else { - return getInfo(f->begin()->begin()); + return getInfo(static_cast(f->begin()->begin())); } } -- cgit v1.2.3