commit 4361beff5bc540c43ab7c072c99994adc4ed78f9
author Nicolas Geoffray <ngeoffray@google.com> Wed Aug 20 04:59:12 2014 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Wed Aug 20 05:01:31 2014 +0100
tree 32479614a34831b549ac93965f0c0fab3cf4f6d3
parent 10dac8ee833a297ad0ffc5877305f2d132259478

Fix bug introduced in https://android-review.googlesource.com/102610.

Also make oatdump work again.

Change-Id: Iab96971645f40585bc04769d410f2273d3977f51

compiler/optimizing/code_generator.h

diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 24e0277..12337c9 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -143,7 +143,7 @@
  protected:
   CodeGenerator(HGraph* graph, size_t number_of_registers)
       : frame_size_(kUninitializedFrameSize),
-        core_spill_mask_(-1),
+        core_spill_mask_(0),
         graph_(graph),
         block_labels_(graph->GetArena(), 0),
         pc_infos_(graph->GetArena(), 32),

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 7d9922d..50dfe21 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -534,7 +534,9 @@
     methods_pointer_index = num_set_bits;
   }
   const OatMethodOffsets& oat_method_offsets = methods_pointer_[methods_pointer_index];
-  if (oat_file_->IsExecutable() || Runtime::Current()->IsCompiler()) {
+  if (oat_file_->IsExecutable()
+      || (Runtime::Current() == nullptr)
+      || Runtime::Current()->IsCompiler()) {
     return OatMethod(
         oat_file_->Begin(),
         oat_method_offsets.code_offset_,