diff options
| author | 2015-12-04 14:06:18 -0800 | |
|---|---|---|
| committer | 2015-12-23 21:14:23 -0800 | |
| commit | dcdc85bbd569f0ee66c331b4219c19304a616214 (patch) | |
| tree | b5ab789248e279318f6c1e3f6c511703d7294476 /runtime/oat_quick_method_header.h | |
| parent | 48944c760b196188b968b7af81439466cf987a75 (diff) | |
Dex2oat support for multiple oat file and image file outputs.
Multiple changes to dex2oat and the runtime to support a --multi-image
option. This generates a separate oat file and image file output for
each dex file input.
Change-Id: Ie1d6f0b8afa8aed5790065b8c2eb177990c60129
Diffstat (limited to 'runtime/oat_quick_method_header.h')
| -rw-r--r-- | runtime/oat_quick_method_header.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h index 03cad0835e..564373958a 100644 --- a/runtime/oat_quick_method_header.h +++ b/runtime/oat_quick_method_header.h @@ -44,7 +44,8 @@ class PACKED(4) OatQuickMethodHeader { uintptr_t code = reinterpret_cast<uintptr_t>(code_ptr); uintptr_t header = code - OFFSETOF_MEMBER(OatQuickMethodHeader, code_); DCHECK(IsAlignedParam(code, GetInstructionSetAlignment(kRuntimeISA)) || - IsAlignedParam(header, GetInstructionSetAlignment(kRuntimeISA))); + IsAlignedParam(header, GetInstructionSetAlignment(kRuntimeISA))) + << std::hex << code << " " << std::hex << header; return reinterpret_cast<OatQuickMethodHeader*>(header); } |