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 /compiler/oat_test.cc | |
| parent | e1910f1d802dff79bba5ef61e1c4fd0b95f6e5b0 (diff) | |
| download | android_art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.gz android_art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.bz2 android_art-7624d25dad2d1ba25969ae704fccf68649103ae5.zip | |
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 'compiler/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index b5d39232ca..66972cbf69 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -17,11 +17,12 @@ #include "common_compiler_test.h" #include "compiler/compiler.h" #include "compiler/oat_writer.h" +#include "entrypoints/quick/quick_entrypoints.h" #include "mirror/art_method-inl.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "oat_file.h" +#include "oat_file-inl.h" #include "vector_output_stream.h" namespace art { @@ -176,8 +177,9 @@ TEST_F(OatTest, OatHeaderSizeCheck) { // If this test is failing and you have to update these constants, // it is time to update OatHeader::kOatVersion EXPECT_EQ(80U, sizeof(OatHeader)); - EXPECT_EQ(20U, sizeof(OatMethodOffsets)); - EXPECT_EQ(12U, sizeof(OatMethodHeader)); + EXPECT_EQ(8U, sizeof(OatMethodOffsets)); + EXPECT_EQ(24U, sizeof(OatQuickMethodHeader)); + EXPECT_EQ(320U, sizeof(QuickEntryPoints)); } TEST_F(OatTest, OatHeaderIsValid) { |