---

yaml
---
r: 2406
b: refs/heads/master
c: d089d9f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e2088f2faf5e53ebf8af52d9bd7e034c5fc61c2
+refs/heads/master: d089d9f9ed01464940ef6e383ec239bbd5612e8c

trunk/mk/rustllvm.mk

@@ -3,7 +3,7 @@
 ######################################################################
 
 RUSTLLVM_LIB_CS := $(addprefix rustllvm/, \
-                     MachOObjectFile.cpp Passes.cpp)
+                     MachOObjectFile.cpp Passes.cpp Passes2.cpp)
 
 RUSTLLVM_OBJS_CS := $(addprefix rustllvm/, RustWrapper.cpp)
 

trunk/src/comp/lib/llvm.rs

@@ -802,6 +802,16 @@ native mod llvm = llvm_lib {
     fn LLVMAddTypeBasedAliasAnalysisPass(PassManagerRef PM);
     fn LLVMAddBasicAliasAnalysisPass(PassManagerRef PM);
 
+    // FIXME: Native stubs don't allow this many arguments yet.
+    /*fn LLVMAddStandardModulePasses(PassManagerRef PM,
+                                   uint OptimizationLevel,
+                                   Bool OptimizeSize,
+                                   Bool UnitAtATime,
+                                   Bool UnrollLoops,
+                                   Bool SimplifyLibCalls,
+                                   Bool HaveExceptions,
+                                   uint InliningThreshold);*/
+
     /** Destroys a memory buffer. */
     fn LLVMDisposeMemoryBuffer(MemoryBufferRef MemBuf);
 

trunk/src/rustllvm/Passes2.cpp

@@ -0,0 +1,24 @@
+#include "llvm/Analysis/Passes.h"
+#include "llvm/Support/StandardPasses.h"
+#include "llvm/PassManager.h"
+#include "llvm-c/Core.h"
+#include <cstdlib>
+
+using namespace llvm;
+
+extern "C" void LLVMAddStandardModulePasses(LLVMPassManagerRef PM,
+    unsigned int OptimizationLevel, bool OptimizeSize, bool UnitAtATime,
+    bool UnrollLoops, bool SimplifyLibCalls, bool HaveExceptions,
+    unsigned int InliningThreshold) {
+  Pass *InliningPass;
+  if (InliningThreshold)
+    InliningPass = createFunctionInliningPass(InliningThreshold);
+  else
+    InliningPass = NULL;
+
+  createStandardModulePasses(unwrap(PM), OptimizationLevel, OptimizeSize,
+                             UnitAtATime, UnrollLoops, SimplifyLibCalls,
+                             HaveExceptions, InliningPass);
+}
+
+

trunk/src/rustllvm/rustllvm.def.in

@@ -68,6 +68,7 @@ LLVMAddScalarReplAggregatesPass
 LLVMAddScalarReplAggregatesPassSSA
 LLVMAddScalarReplAggregatesPassWithThreshold
 LLVMAddSimplifyLibCallsPass
+LLVMAddStandardModulePasses
 LLVMAddStripDeadPrototypesPass
 LLVMAddStripSymbolsPass
 LLVMAddTailCallEliminationPass