diff options
| author | 2018-07-27 15:58:15 +0000 | |
|---|---|---|
| committer | 2018-07-27 15:58:15 +0000 | |
| commit | 9acb522e35e3302786a338c7f50585dd412d68d3 (patch) | |
| tree | f665fa233579d933da378299c20e65ed6e317012 /compiler/exception_test.cc | |
| parent | 921702dfd9d857aef1331f653ec7b656e0b080e8 (diff) | |
| parent | 8808756b8fba036a9c73a45c800a56be09872364 (diff) | |
Merge changes I07fcf6f2,I01074aee
* changes:
Remove frame info from OatQuickMethodHeader.
ARM64: Fix the CallOtherJustTooFarAfter test.
Diffstat (limited to 'compiler/exception_test.cc')
| -rw-r--r-- | compiler/exception_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index b56a991e74..90c9e52e84 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -89,7 +89,7 @@ class ExceptionTest : public CommonRuntimeTest { fake_header_code_and_maps_.resize(code_offset + fake_code_.size()); MemoryRegion stack_maps_region(&fake_header_code_and_maps_[0], stack_maps_size); stack_maps.FillInCodeInfo(stack_maps_region); - OatQuickMethodHeader method_header(code_offset, 0u, 4 * sizeof(void*), 0u, 0u, code_size); + OatQuickMethodHeader method_header(code_offset, 0u, code_size); static_assert(std::is_trivially_copyable<OatQuickMethodHeader>::value, "Cannot use memcpy"); memcpy(&fake_header_code_and_maps_[code_offset - header_size], &method_header, header_size); std::copy(fake_code_.begin(), |