diff options
| author | 2016-10-20 14:41:18 +0000 | |
|---|---|---|
| committer | 2016-10-20 14:41:18 +0000 | |
| commit | 024662a3102df92fabf4f40d9ec40976f8e20c5d (patch) | |
| tree | 248a072ebfa8e3a7897ad08f819456f28e47c0bc /compiler/oat_test.cc | |
| parent | 4a4ff643b629b268787fb97648116e1ac391f53b (diff) | |
| parent | af1e2990cd1406a0fb7cba1d2e208208e950e413 (diff) | |
Merge changes I16f8b7ec,I075bbf55
* changes:
jni: Support @FastNative methods that return objects
Revert "jni: Disable FastNative path for methods returning objects"
Diffstat (limited to 'compiler/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 593d8e92f9..ffeff760c6 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -462,7 +462,7 @@ TEST_F(OatTest, OatHeaderSizeCheck) { EXPECT_EQ(72U, sizeof(OatHeader)); EXPECT_EQ(4U, sizeof(OatMethodOffsets)); EXPECT_EQ(20U, sizeof(OatQuickMethodHeader)); - EXPECT_EQ(163 * static_cast<size_t>(GetInstructionSetPointerSize(kRuntimeISA)), + EXPECT_EQ(164 * static_cast<size_t>(GetInstructionSetPointerSize(kRuntimeISA)), sizeof(QuickEntryPoints)); } |