commit 39ebcb800aabedd0ffa6aa4aeac8aa4194c66e61
author Ian Rogers <irogers@google.com> Thu May 30 16:57:23 2013 -0700
committer Ian Rogers <irogers@google.com> Fri May 31 11:43:42 2013 -0700
tree 3efbbafa4cc39683a8bcbc2d76103c3d5bfbf072
parent f89eccd509475cb1949c729e796b26a2a248ae04

More profiler driven tweaks.

Make more code inlinable by moving to header files.
Use reserve on std::vectors to avoid reallocation.

Change-Id: I1bf67d32dd58ff5c06dec73a247fadc3de593e91

src/verifier/method_verifier.cc

diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index a7d26bb..674ca12 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -32,11 +32,12 @@
 #include "mirror/abstract_method-inl.h"
 #include "mirror/class.h"
 #include "mirror/class-inl.h"
-#include "mirror/dex_cache.h"
+#include "mirror/dex_cache-inl.h"
 #include "mirror/field-inl.h"
 #include "mirror/object-inl.h"
 #include "mirror/object_array-inl.h"
 #include "object_utils.h"
+#include "register_line-inl.h"
 #include "runtime.h"
 #include "verifier/dex_gc_map.h"
 
@@ -949,9 +950,9 @@
     DCHECK_NE(failures_.size(), 0U);
     return false;  // Not a real failure, but a failure to encode
   }
-#ifndef NDEBUG
-  VerifyGcMap(*map);
-#endif
+  if (kIsDebugBuild) {
+    VerifyGcMap(*map);
+  }
   const std::vector<uint8_t>* dex_gc_map = CreateLengthPrefixedDexGcMap(*(map.get()));
   verifier::MethodVerifier::SetDexGcMap(ref, *dex_gc_map);
 
@@ -3275,6 +3276,7 @@
     Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "Failed to encode GC map (size=" << table_size << ")";
     return NULL;
   }
+  table->reserve(table_size);
   // Write table header
   table->push_back(format | ((ref_bitmap_bytes >> DexPcToReferenceMap::kRegMapFormatShift) &
                              ~DexPcToReferenceMap::kRegMapFormatMask));
@@ -3335,7 +3337,7 @@
     }
     dex_gc_maps_->Put(ref, &gc_map);
   }
-  CHECK(GetDexGcMap(ref) != NULL);
+  DCHECK(GetDexGcMap(ref) != NULL);
 }
 
 void  MethodVerifier::SetDevirtMap(CompilerDriver::MethodReference ref, const PcToConcreteMethod* devirt_map) {