commit 5a6220c9068f8401394664b56a725441dba17948
author Ian Rogers <irogers@google.com> Mon Sep 24 10:52:10 2012 -0700
committer Ian Rogers <irogers@google.com> Mon Sep 24 10:52:10 2012 -0700
tree 6d1d1edf74c854c5bdb76d694af97d6c4b367dec
parent 952a94a11e48b8c21d6c51ebf1975208eda2e1ec

Fix exception_test for verify stack.

Create a fake native GC map as the verifier no longer creates the GC
map.

Change-Id: I94cfe444d8e9fec16e2affdf36b77fd32950f8f2

src/exception_test.cc

diff --git a/src/exception_test.cc b/src/exception_test.cc
index 46184c5..7303ac6 100644
--- a/src/exception_test.cc
+++ b/src/exception_test.cc
@@ -53,12 +53,18 @@
 
     fake_vmap_table_data_.push_back(0);
 
+    fake_gc_map_.push_back(0);  // 0 bytes to encode references and native pc offsets.
+    fake_gc_map_.push_back(0);
+    fake_gc_map_.push_back(0);  // 0 entries.
+    fake_gc_map_.push_back(0);
+
     method_f_ = my_klass_->FindVirtualMethod("f", "()I");
     ASSERT_TRUE(method_f_ != NULL);
     method_f_->SetFrameSizeInBytes(kStackAlignment);
     method_f_->SetCode(CompiledMethod::CodePointer(&fake_code_[sizeof(code_size)], kThumb2));
     method_f_->SetMappingTable(&fake_mapping_data_[0]);
     method_f_->SetVmapTable(&fake_vmap_table_data_[0]);
+    method_f_->SetNativeGcMap(&fake_gc_map_[0]);
 
     method_g_ = my_klass_->FindVirtualMethod("g", "(I)V");
     ASSERT_TRUE(method_g_ != NULL);
@@ -66,6 +72,7 @@
     method_g_->SetCode(CompiledMethod::CodePointer(&fake_code_[sizeof(code_size)], kThumb2));
     method_g_->SetMappingTable(&fake_mapping_data_[0]);
     method_g_->SetVmapTable(&fake_vmap_table_data_[0]);
+    method_g_->SetNativeGcMap(&fake_gc_map_[0]);
   }
 
   const DexFile* dex_;
@@ -73,6 +80,7 @@
   std::vector<uint8_t> fake_code_;
   std::vector<uint32_t> fake_mapping_data_;
   std::vector<uint16_t> fake_vmap_table_data_;
+  std::vector<uint8_t> fake_gc_map_;
 
   AbstractMethod* method_f_;
   AbstractMethod* method_g_;