From b68ed2c708a5a3fcc8c2cec944c1080a6fbb88f5 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 20 Jun 2018 10:39:31 -0700 Subject: ART: Ensure OatQuickMethodHeader is trivially copyable Remove empty constructor. Test: mmma art Change-Id: Ie58721299a6675797e9a525f4eb7e6df82abed50 --- compiler/exception_test.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'compiler/exception_test.cc') diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index 15c07870a1..8235be943b 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -15,6 +15,7 @@ */ #include +#include #include "base/arena_allocator.h" #include "base/callee_save_type.h" @@ -92,6 +93,7 @@ class ExceptionTest : public CommonRuntimeTest { 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); + static_assert(std::is_trivially_copyable::value, "Cannot use memcpy"); memcpy(&fake_header_code_and_maps_[code_offset - header_size], &method_header, header_size); std::copy(fake_code_.begin(), fake_code_.end(), -- cgit v1.2.3-59-g8ed1b