<div dir="ltr">Thanks Dave!</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Feb 19, 2015 at 11:06 AM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dblaikie<br>
Date: Thu Feb 19 13:06:04 2015<br>
New Revision: 229888<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229888&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229888&view=rev</a><br>
Log:<br>
[orcjit] Include CMake support for the fully_lazy example and fix the build<br>
<br>
Not sure if/how to make the CMake build use C++14 for the examples, so<br>
let's stick to C++11 for now.<br>
<br>
Modified:<br>
    llvm/trunk/examples/Kaleidoscope/Orc/CMakeLists.txt<br>
    llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/CMakeLists.txt<br>
    llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp<br>
<br>
Modified: llvm/trunk/examples/Kaleidoscope/Orc/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/CMakeLists.txt?rev=229888&r1=229887&r2=229888&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/CMakeLists.txt?rev=229888&r1=229887&r2=229888&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/examples/Kaleidoscope/Orc/CMakeLists.txt (original)<br>
+++ llvm/trunk/examples/Kaleidoscope/Orc/CMakeLists.txt Thu Feb 19 13:06:04 2015<br>
@@ -1,3 +1,4 @@<br>
 add_subdirectory(initial)<br>
 add_subdirectory(lazy_codegen)<br>
 add_subdirectory(lazy_irgen)<br>
+add_subdirectory(fully_lazy)<br>
<br>
Modified: llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/CMakeLists.txt?rev=229888&r1=229887&r2=229888&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/CMakeLists.txt?rev=229888&r1=229887&r2=229888&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/CMakeLists.txt (original)<br>
+++ llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/CMakeLists.txt Thu Feb 19 13:06:04 2015<br>
@@ -2,11 +2,12 @@ set(LLVM_LINK_COMPONENTS<br>
   Core<br>
   ExecutionEngine<br>
   Object<br>
+  OrcJIT<br>
   RuntimeDyld<br>
   Support<br>
   native<br>
   )<br>
<br>
-add_kaleidoscope_chapter(Kaleidoscope-Orc-lazy_irgen<br>
+add_kaleidoscope_chapter(Kaleidoscope-Orc-fully_lazy<br>
   toy.cpp<br>
   )<br>
<br>
Modified: llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp?rev=229888&r1=229887&r2=229888&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp?rev=229888&r1=229887&r2=229888&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp (original)<br>
+++ llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp Thu Feb 19 13:06:04 2015<br>
@@ -1280,11 +1280,11 @@ private:<br>
     //<br>
     //   The update action will update FunctionBodyPointer to point at the newly<br>
     // compiled function.<br>
-    CallbackInfo.setCompileAction(<br>
-      [this, Fn = std::shared_ptr<FunctionAST>(std::move(FnAST))](){<br>
-        auto H = addModule(IRGen(Session, *Fn));<br>
-        return findSymbolIn(H, Fn->Proto->Name).getAddress();<br>
-      });<br>
+    std::shared_ptr<FunctionAST> Fn = std::move(FnAST);<br>
+    CallbackInfo.setCompileAction([this, Fn]() {<br>
+      auto H = addModule(IRGen(Session, *Fn));<br>
+      return findSymbolIn(H, Fn->Proto->Name).getAddress();<br>
+    });<br>
     CallbackInfo.setUpdateAction(<br>
       CompileCallbacks.getLocalFPUpdater(H, Mangle(BodyPtrName)));<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>