commit e0918ac3cd6070c084b76d737af055e88a7679db
author Stephen Hines <srhines@google.com> Thu Mar 01 23:28:09 2012 -0800
committer Stephen Hines <srhines@google.com> Thu Mar 01 23:28:09 2012 -0800
tree 205be382447157a41cb0a358df8a873e638d729a
parent 208fbc25dab2bf875bee765becb5f0726d513dfb
parent 7c75d9156426d82c1e6616a4a5741f5a37ae3f0e

resolved conflicts for merge of 7c75d915 to master

Change-Id: I25c1dc90af679e2463abffd33ee8838b4727396f

lib/ExecutionEngine/Compiler.h

diff --git a/lib/ExecutionEngine/Compiler.h b/lib/ExecutionEngine/Compiler.h
index 8cc3d2e..c70a920 100644
--- a/lib/ExecutionEngine/Compiler.h
+++ b/lib/ExecutionEngine/Compiler.h
@@ -184,7 +184,8 @@
     int runLTO(llvm::TargetData *TD,
                llvm::NamedMDNode const *ExportVarMetadata,
                llvm::NamedMDNode const *ExportFuncMetadata,
-               std::vector<std::string>& ForEachExpandList);
+               std::vector<std::string>& ForEachExpandList,
+               llvm::CodeGenOpt::Level OptimizationLevel);
 
     bool hasError() const {
       return !mError.empty();