commit 9e81e37a0400874aa3a327123c0e4d6e8bfc5290
author Shih-wei Liao <sliao@google.com> Tue Jan 17 16:38:40 2012 -0800
committer Shih-wei Liao <sliao@google.com> Tue Jan 17 16:42:46 2012 -0800
tree e0217567632be9a8462dcedcb18afc5e102dd750
parent 4deffde52a049eb1b5f2e5504653e5b810c554bf

Add "const". And clean up.

Change-Id: I70e6994a0cd1d897e6981d5642108fee1324708f

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index ff7f0f1..45958dc 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -296,7 +296,7 @@
 }
 
 
-int Compiler::compile(CompilerOption &option) {
+int Compiler::compile(const CompilerOption &option) {
   llvm::Target const *Target = NULL;
   llvm::TargetData *TD = NULL;
   llvm::TargetMachine *TM = NULL;

lib/ExecutionEngine/Compiler.h

diff --git a/lib/ExecutionEngine/Compiler.h b/lib/ExecutionEngine/Compiler.h
index f436df0..b99588a 100644
--- a/lib/ExecutionEngine/Compiler.h
+++ b/lib/ExecutionEngine/Compiler.h
@@ -153,7 +153,7 @@
 
     int linkModule(llvm::Module *module);
 
-    int compile(CompilerOption &option);
+    int compile(const CompilerOption &option);
 
     char const *getErrorMessage() {
       return mError.c_str();

lib/ExecutionEngine/CompilerOption.h

diff --git a/lib/ExecutionEngine/CompilerOption.h b/lib/ExecutionEngine/CompilerOption.h
index cb6a5de..78a934a 100644
--- a/lib/ExecutionEngine/CompilerOption.h
+++ b/lib/ExecutionEngine/CompilerOption.h
@@ -37,7 +37,7 @@
   // pass to the Compiler::compiler() without any modification for RenderScript,
   // see Script::prepareExecutable(...)).
   //
-  // Must be invoked after call Compiler::GlobalInitialization() at least once.
+  // Must be invoked after calling Compiler::GlobalInitialization() at least once.
   //
   CompilerOption() {
     //-- Setup options to llvm::TargetMachine --//
@@ -46,10 +46,11 @@
 #if defined(__HOST__)
     // Disable frame pointer elimination optimization for X86_64 and X86
     if ((Compiler::getTargetArchType() == llvm::Triple::x86_64) ||
-        (Compiler::getTargetArchType() == llvm::Triple::x86))
+        (Compiler::getTargetArchType() == llvm::Triple::x86)) {
       TargetOpt.NoFramePointerElim = true;
-    else
+    } else {
       TargetOpt.NoFramePointerElim = false;
+    }
 #elif defined(DEFAULT_X86_64_CODEGEN)
     TargetOpt.NoFramePointerElim = true;
 #elif defined(DEFAULT_X86_CODEGEN)

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index 085e7c8..2030db9 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -325,7 +325,7 @@
 }
 #endif
 
-int Script::internalCompile(CompilerOption &option) {
+int Script::internalCompile(const CompilerOption &option) {
   // Create the ScriptCompiled object
   mCompiled = new (std::nothrow) ScriptCompiled(this);
 

lib/ExecutionEngine/Script.h

diff --git a/lib/ExecutionEngine/Script.h b/lib/ExecutionEngine/Script.h
index ef682a6..fbe4956 100644
--- a/lib/ExecutionEngine/Script.h
+++ b/lib/ExecutionEngine/Script.h
@@ -221,7 +221,7 @@
 #if USE_CACHE
     int internalLoadCache(bool checkOnly);
 #endif
-    int internalCompile(CompilerOption&);
+    int internalCompile(const CompilerOption&);
 
   };
 

lib/ExecutionEngine/ScriptCompiled.h

diff --git a/lib/ExecutionEngine/ScriptCompiled.h b/lib/ExecutionEngine/ScriptCompiled.h
index f7bf48b..5da8851 100644
--- a/lib/ExecutionEngine/ScriptCompiled.h
+++ b/lib/ExecutionEngine/ScriptCompiled.h
@@ -85,7 +85,7 @@
       return mCompiler.linkModule(module);
     }
 
-    int compile(CompilerOption &option) {
+    int compile(const CompilerOption &option) {
       return mCompiler.compile(option);
     }