---

yaml
---
r: 2379
b: refs/heads/master
c: 5fb6e63
h: refs/heads/master
i:
  2377: 7f878c5
  2375: 72095a1
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b742aec91f1c2615ab8e01ba027dfff3008a7f7
+refs/heads/master: 5fb6e6364b6b10e98430140554e644697f29eb06

trunk/src/comp/back/Link.rs

@@ -16,6 +16,10 @@ tag output_type {
     output_type_object;
 }
 
+fn link_intrinsics(session.session sess, ModuleRef llmod) {
+    // TODO
+}
+
 mod Write {
     fn is_object_or_assembly(output_type ot) -> bool {
         if (ot == output_type_assembly) {
@@ -41,6 +45,8 @@ mod Write {
     }
 
     fn run_passes(session.session sess, ModuleRef llmod, str output) {
+        link_intrinsics(sess, llmod);
+
         auto pm = mk_pass_manager();
         auto opts = sess.get_opts();
 

trunk/src/comp/lib/llvm.rs

@@ -848,6 +848,9 @@ native mod llvm = llvm_lib {
         call. */
     fn LLVMRustGetLastError() -> sbuf;
 
+    /** Parses the bitcode in the given memory buffer. */
+    fn LLVMRustParseBitcode(MemoryBufferRef MemBuf) -> ModuleRef;
+
     /** Links LLVM modules together. `Src` is destroyed by this call and
         must never be referenced again. */
     fn LLVMLinkModules(ModuleRef Dest, ModuleRef Src) -> Bool;

trunk/src/rustllvm/RustWrapper.cpp

@@ -21,6 +21,7 @@
 #include "llvm/Target/TargetRegistry.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm-c/Core.h"
+#include "llvm-c/BitReader.h"
 #include "llvm-c/Object.h"
 #include <cstdlib>
 
@@ -98,3 +99,10 @@ extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
   (void)foo;
   PM->run(*unwrap(M));
 }
+
+extern "C" LLVMModuleRef LLVMRustParseBitcode(LLVMMemoryBufferRef MemBuf) {
+  LLVMModuleRef M;
+  return LLVMParseBitcode(MemBuf, &M, const_cast<char **>(&LLVMRustError))
+         ? NULL : M;
+}
+

trunk/src/rustllvm/rustllvm.def.in

@@ -1,6 +1,7 @@
 LLVMRustCreateMemoryBufferWithContentsOfFile
 LLVMRustWriteOutputFile
 LLVMRustGetLastError
+LLVMRustParseBitcode
 LLVMLinkModules
 LLVMCreateObjectFile
 LLVMDisposeObjectFile