diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-05-02 14:40:15 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-05-13 11:43:22 +0100 |
| commit | 7624d25dad2d1ba25969ae704fccf68649103ae5 (patch) | |
| tree | de72194b76a4e23e0b15ec4085447ae7e4425815 /runtime/exception_test.cc | |
| parent | e1910f1d802dff79bba5ef61e1c4fd0b95f6e5b0 (diff) | |
| download | art-7624d25dad2d1ba25969ae704fccf68649103ae5.zip art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.gz art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.bz2 | |
Move quick frame info to OatQuickMethodHeader.
Rename OatMethodHeader to OatQuickMethodHeader, move frame
info from OatMethodOffsets to OatQuickMethodHeader. Retrieve
the info from other places for non-quick methods (portable
compiled bytecode or jni stub, generic jni, runtime,
abstract and proxy).
This change has a libcore/ companion CL
"Remove ArtMethod's quick fields for frame size and spills."
https://android-review.googlesource.com/94164
Bug: 11767815
Change-Id: I0e31a7875d76732e1ec479c86b9b5ca01203507f
Diffstat (limited to 'runtime/exception_test.cc')
| -rw-r--r-- | runtime/exception_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/exception_test.cc b/runtime/exception_test.cc index 97a8367..feb2331 100644 --- a/runtime/exception_test.cc +++ b/runtime/exception_test.cc @@ -72,9 +72,10 @@ class ExceptionTest : public CommonRuntimeTest { const std::vector<uint8_t>& fake_vmap_table_data = fake_vmap_table_data_.GetData(); const std::vector<uint8_t>& fake_mapping_data = fake_mapping_data_.GetData(); - uint32_t vmap_table_offset = sizeof(OatMethodHeader) + fake_vmap_table_data.size(); + uint32_t vmap_table_offset = sizeof(OatQuickMethodHeader) + fake_vmap_table_data.size(); uint32_t mapping_table_offset = vmap_table_offset + fake_mapping_data.size(); - OatMethodHeader method_header(vmap_table_offset, mapping_table_offset, code_size); + OatQuickMethodHeader method_header(mapping_table_offset, vmap_table_offset, + 4 * kPointerSize, 0u, 0u, code_size); fake_header_code_and_maps_.resize(sizeof(method_header)); memcpy(&fake_header_code_and_maps_[0], &method_header, sizeof(method_header)); fake_header_code_and_maps_.insert(fake_header_code_and_maps_.begin(), @@ -91,13 +92,11 @@ class ExceptionTest : public CommonRuntimeTest { method_f_ = my_klass_->FindVirtualMethod("f", "()I"); ASSERT_TRUE(method_f_ != NULL); - method_f_->SetFrameSizeInBytes(4 * kPointerSize); method_f_->SetEntryPointFromQuickCompiledCode(code_ptr); method_f_->SetNativeGcMap(&fake_gc_map_[0]); method_g_ = my_klass_->FindVirtualMethod("g", "(I)V"); ASSERT_TRUE(method_g_ != NULL); - method_g_->SetFrameSizeInBytes(4 * kPointerSize); method_g_->SetEntryPointFromQuickCompiledCode(code_ptr); method_g_->SetNativeGcMap(&fake_gc_map_[0]); } |