commit a7e5c8f85434e9b8cb0637da302135ba2e2976f5
author Stephen Hines <srhines@google.com> Wed Mar 28 12:58:24 2012 -0700
committer Stephen Hines <srhines@google.com> Wed Mar 28 12:58:24 2012 -0700
tree 4772b4c3835dfc9c4fb5be12d1b8caa6db4b430b
parent a75396f25b870ef51bf8d40daeef3846a775357d
parent f46fa664497f7933f0a28ddfe9afdf2a459b3a05

resolved conflicts for merge of f46fa664 to master

Change-Id: I073ac3c0f95b3da9567e54c1fc8e8b1b0d69e33f

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index 5895057..58a49c5 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -274,7 +274,7 @@
   std::vector<const char*> ExportSymbols;
 
   // Defaults to maximum optimization level from MetadataExtractor.
-  int OptimizationLevel = ME.getOptimizationLevel();
+  uint32_t OptimizationLevel = ME.getOptimizationLevel();
 
   if (OptimizationLevel == 0) {
     CodeGenOptLevel = llvm::CodeGenOpt::None;