commit 5708376183c4e2d4456a191955c5060e404a9f0a
author Nicolas Geoffray <ngeoffray@google.com> Tue Mar 05 09:24:45 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Mar 05 15:40:35 2019 +0000
tree 4afed897b6e71c45b4f51ae9536d5bb6da7ec024
parent 3c83921510c849cd43b90ab6094abce232c8c088

Revert "Remove code size from OatQuickMethodHeader"

This reverts commit 131f23a4c2c34b689c07e6efd05cea74190f0113.

Bug: 123510633
Bug: 127305289

Reason for revert: b/127305289

Change-Id: I59905779fe8c7d7551c0fa6c8693fb64eb6760b2

compiler/exception_test.cc

diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc
index 48d1ed6..f978cc6 100644
--- a/compiler/exception_test.cc
+++ b/compiler/exception_test.cc
@@ -93,7 +93,7 @@
       AlignUp(&fake_header_code_and_maps_[stack_maps_size + header_size], code_alignment);
 
     memcpy(&fake_header_code_and_maps_[0], stack_map.data(), stack_maps_size);
-    OatQuickMethodHeader method_header(code_ptr - fake_header_code_and_maps_.data());
+    OatQuickMethodHeader method_header(code_ptr - fake_header_code_and_maps_.data(), code_size);
     static_assert(std::is_trivially_copyable<OatQuickMethodHeader>::value, "Cannot use memcpy");
     memcpy(code_ptr - header_size, &method_header, header_size);
     memcpy(code_ptr, fake_code_.data(), fake_code_.size());