commit bdbc11899d04b284c0ec4b055e1a009c7034aaa5
author Brian Carlstrom <bdc@google.com> Tue Feb 25 06:02:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 25 06:02:43 2014 +0000
tree 65bbdbb112006237f9daeee9fd47f69a3e678f0d
parent fffb0b7e23796e5470f4fab4611f2fcc4a16979c
parent ae7083dac2db59dcdef869e35ac44a039d888ee9

Merge "Add additional const"

compiler/driver/compiler_callbacks_impl.h

diff --git a/compiler/driver/compiler_callbacks_impl.h b/compiler/driver/compiler_callbacks_impl.h
index ab57832..fd2cd4a 100644
--- a/compiler/driver/compiler_callbacks_impl.h
+++ b/compiler/driver/compiler_callbacks_impl.h
@@ -50,8 +50,8 @@
     }
 
   private:
-    VerificationResults* verification_results_;
-    DexFileToMethodInlinerMap* method_inliner_map_;
+    VerificationResults* const verification_results_;
+    DexFileToMethodInlinerMap* const method_inliner_map_;
 };
 
 }  // namespace art

compiler/driver/compiler_driver.h

diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 5009779..377eb6f 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -558,9 +558,9 @@
   std::vector<const CallPatchInformation*> methods_to_patch_;
   std::vector<const TypePatchInformation*> classes_to_patch_;
 
-  const CompilerOptions* compiler_options_;
-  VerificationResults* verification_results_;
-  DexFileToMethodInlinerMap* method_inliner_map_;
+  const CompilerOptions* const compiler_options_;
+  VerificationResults* const verification_results_;
+  DexFileToMethodInlinerMap* const method_inliner_map_;
 
   UniquePtr<CompilerBackend> compiler_backend_;
 

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 6c879d0..a082e36 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -487,14 +487,14 @@
     return false;
   }
 
-  const CompilerOptions* compiler_options_;
+  const CompilerOptions* const compiler_options_;
   const CompilerBackend::Kind compiler_backend_;
 
   const InstructionSet instruction_set_;
   const InstructionSetFeatures instruction_set_features_;
 
-  VerificationResults* verification_results_;
-  DexFileToMethodInlinerMap* method_inliner_map_;
+  VerificationResults* const verification_results_;
+  DexFileToMethodInlinerMap* const method_inliner_map_;
   Runtime* runtime_;
   size_t thread_count_;
   uint64_t start_ns_;