From 9c4c23b32e21df81de54e1f51df93ec77a55acfb Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 8 Feb 2015 21:03:30 +0000 Subject: Kaleidoscope-Orc: Reuse the IRGen utility function in later chapters, and remove an unused parameter. llvm-svn: 228543 --- llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp | 32 ++++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp') diff --git a/llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp b/llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp index e1e259da76c..2963f30e2ed 100644 --- a/llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp +++ b/llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp @@ -1124,6 +1124,19 @@ Function *FunctionAST::IRGen(IRGenContext &C) const { // Top-Level parsing and JIT Driver //===----------------------------------------------------------------------===// +static std::unique_ptr IRGen(SessionContext &S, + const FunctionAST &F) { + IRGenContext C(S); + auto LF = F.IRGen(C); + if (!LF) + return nullptr; +#ifndef MINIMAL_STDERR_OUTPUT + fprintf(stderr, "Read function definition:"); + LF->dump(); +#endif + return C.takeM(); +} + class KaleidoscopeJIT { public: typedef ObjectLinkingLayer<> ObjLayerT; @@ -1166,20 +1179,19 @@ public: // If we don't find 'Name' in the JIT, see if we have some AST // for it. - if (!Session.FunctionDefs.count(Name)) + auto DefI = Session.FunctionDefs.find(Name); + if (DefI == Session.FunctionDefs.end()) return 0; // We have AST for 'Name'. IRGen it, add it to the JIT, and // return the address for it. - IRGenContext C(Session); - { - // Take ownership of the AST: We can release the memory as - // soon as we've IRGen'd it. - auto FuncAST = std::move(Session.FunctionDefs[Name]); - FuncAST->IRGen(C); - } - - addModule(C.takeM()); + // FIXME: What happens if IRGen fails? + addModule(IRGen(Session, *DefI->second)); + + // Remove the function definition's AST now that we've + // finished with it. + Session.FunctionDefs.erase(DefI); + return getMangledSymbolAddress(Name); }, [](const std::string &S) { return 0; } ); -- cgit v1.2.3