From d8ef2e991a1a65f47a26a1eb8c6b34c92b775d6b Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 24 Feb 2015 16:02:06 +0000 Subject: not-int can also take non-int (byte and short) instructions. So we should use the result-type instead if the input type for knowning what instruction to use. Bug: 19454010 Change-Id: I88782ad27ae8c8e1b7868afede5057d26f14685a --- compiler/optimizing/code_generator_arm.cc | 2 +- compiler/optimizing/code_generator_arm64.cc | 2 +- compiler/optimizing/code_generator_x86.cc | 2 +- compiler/optimizing/code_generator_x86_64.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index e864ae1cec..cda5c1a99c 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -2478,7 +2478,7 @@ void InstructionCodeGeneratorARM::VisitNot(HNot* not_) { LocationSummary* locations = not_->GetLocations(); Location out = locations->Out(); Location in = locations->InAt(0); - switch (not_->InputAt(0)->GetType()) { + switch (not_->GetResultType()) { case Primitive::kPrimInt: __ mvn(out.AsRegister(), ShifterOperand(in.AsRegister())); break; diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 0d7864fa35..729bab78a6 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -2202,7 +2202,7 @@ void LocationsBuilderARM64::VisitNot(HNot* instruction) { } void InstructionCodeGeneratorARM64::VisitNot(HNot* instruction) { - switch (instruction->InputAt(0)->GetType()) { + switch (instruction->GetResultType()) { case Primitive::kPrimInt: case Primitive::kPrimLong: __ Mvn(OutputRegister(instruction), InputOperandAt(instruction, 0)); diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 1101569174..7b35cfded8 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -2575,7 +2575,7 @@ void InstructionCodeGeneratorX86::VisitNot(HNot* not_) { Location in = locations->InAt(0); Location out = locations->Out(); DCHECK(in.Equals(out)); - switch (not_->InputAt(0)->GetType()) { + switch (not_->GetResultType()) { case Primitive::kPrimInt: __ notl(out.AsRegister()); break; diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index 41a19e11f0..74adb31422 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -2514,7 +2514,7 @@ void InstructionCodeGeneratorX86_64::VisitNot(HNot* not_) { DCHECK_EQ(locations->InAt(0).AsRegister().AsRegister(), locations->Out().AsRegister().AsRegister()); Location out = locations->Out(); - switch (not_->InputAt(0)->GetType()) { + switch (not_->GetResultType()) { case Primitive::kPrimInt: __ notl(out.AsRegister()); break; -- cgit v1.2.3-59-g8ed1b