From 33d6903e570daf8f3cf7c1f6ebd9a6dd22c7c23c Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Thu, 18 Jun 2015 18:20:59 +0100 Subject: Replace some run-time assertions with compile-time ones in ART. Change-Id: I16c3fad45c4b98b94b7c83d071374096e81d407a --- compiler/optimizing/code_generator_arm.cc | 3 ++- compiler/optimizing/code_generator_x86_64.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index f6ae45238c..bb5debba29 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -3370,7 +3370,8 @@ void InstructionCodeGeneratorARM::VisitArrayGet(HArrayGet* instruction) { case Primitive::kPrimInt: case Primitive::kPrimNot: { - DCHECK_EQ(sizeof(mirror::HeapReference), sizeof(int32_t)); + static_assert(sizeof(mirror::HeapReference) == sizeof(int32_t), + "art::mirror::HeapReference and int32_t have different sizes."); uint32_t data_offset = mirror::Array::DataOffset(sizeof(int32_t)).Uint32Value(); Register out = locations->Out().AsRegister(); if (index.IsConstant()) { diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index bfc827de1c..4da5bc4e51 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -3503,7 +3503,8 @@ void InstructionCodeGeneratorX86_64::VisitArrayGet(HArrayGet* instruction) { case Primitive::kPrimInt: case Primitive::kPrimNot: { - DCHECK_EQ(sizeof(mirror::HeapReference), sizeof(int32_t)); + static_assert(sizeof(mirror::HeapReference) == sizeof(int32_t), + "art::mirror::HeapReference and int32_t have different sizes."); uint32_t data_offset = mirror::Array::DataOffset(sizeof(int32_t)).Uint32Value(); CpuRegister out = locations->Out().AsRegister(); if (index.IsConstant()) { -- cgit v1.2.3-59-g8ed1b