From c70d1d99654b25491997589b6ecfa431679ea2e3 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Mon, 27 Mar 2017 18:10:04 -0700 Subject: Fix arm64 and x86_64 code generator assertion Test: m test-art-host Change-Id: I273d2dab079b60707a8ffb72227cac5788d1a3bc --- compiler/optimizing/code_generator_arm64.cc | 2 +- compiler/optimizing/code_generator_x86_64.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 28cc942dfb..7257fc54c7 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -3281,7 +3281,7 @@ void InstructionCodeGeneratorARM64::GenerateDivRemWithAnyConstant(HBinaryOperati void InstructionCodeGeneratorARM64::GenerateDivRemIntegral(HBinaryOperation* instruction) { DCHECK(instruction->IsDiv() || instruction->IsRem()); Primitive::Type type = instruction->GetResultType(); - DCHECK(type == Primitive::kPrimInt || Primitive::kPrimLong); + DCHECK(type == Primitive::kPrimInt || type == Primitive::kPrimLong); LocationSummary* locations = instruction->GetLocations(); Register out = OutputRegister(instruction); diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index 2ffc398287..3f321baabb 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -3660,7 +3660,7 @@ void InstructionCodeGeneratorX86_64::GenerateDivRemWithAnyConstant(HBinaryOperat void InstructionCodeGeneratorX86_64::GenerateDivRemIntegral(HBinaryOperation* instruction) { DCHECK(instruction->IsDiv() || instruction->IsRem()); Primitive::Type type = instruction->GetResultType(); - DCHECK(type == Primitive::kPrimInt || Primitive::kPrimLong); + DCHECK(type == Primitive::kPrimInt || type == Primitive::kPrimLong); bool is_div = instruction->IsDiv(); LocationSummary* locations = instruction->GetLocations(); -- cgit v1.2.3-59-g8ed1b