From 7fa7cf59540f36fbfce6d5b553d11ca486a3f207 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 4 Nov 2016 14:10:29 +0000 Subject: Fix ART run-test 562-no-intermediate. - Rename it to 562-checker-no-intermediate, so that Checker assertions are actually verified. - Fix Checker assertions, as they did not match the code expected from the compiler. - Have the test use an integer array (instead of a double array), so that Checker assertions can be extended to ARM as well (the ARM back end does not support the IntermediateAddress instruction on long, float and double arrays). Test: make test-art-target-run-test-562-checker-no-intermediate Bug: 30888043 Change-Id: I32c891948c585983d5fe5d6df092bc7a59c19ae6 --- compiler/optimizing/instruction_simplifier_arm.h | 2 +- compiler/optimizing/instruction_simplifier_arm64.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'compiler') diff --git a/compiler/optimizing/instruction_simplifier_arm.h b/compiler/optimizing/instruction_simplifier_arm.h index 782110c40a..9b54511340 100644 --- a/compiler/optimizing/instruction_simplifier_arm.h +++ b/compiler/optimizing/instruction_simplifier_arm.h @@ -48,7 +48,7 @@ class InstructionSimplifierArmVisitor : public HGraphVisitor { class InstructionSimplifierArm : public HOptimization { public: InstructionSimplifierArm(HGraph* graph, OptimizingCompilerStats* stats) - : HOptimization(graph, kInstructionSimplifierArmPassName, stats) {} + : HOptimization(graph, kInstructionSimplifierArmPassName, stats) {} static constexpr const char* kInstructionSimplifierArmPassName = "instruction_simplifier_arm"; diff --git a/compiler/optimizing/instruction_simplifier_arm64.h b/compiler/optimizing/instruction_simplifier_arm64.h index f71684efe9..d4cb1f14b7 100644 --- a/compiler/optimizing/instruction_simplifier_arm64.h +++ b/compiler/optimizing/instruction_simplifier_arm64.h @@ -82,9 +82,10 @@ class InstructionSimplifierArm64Visitor : public HGraphVisitor { class InstructionSimplifierArm64 : public HOptimization { public: InstructionSimplifierArm64(HGraph* graph, OptimizingCompilerStats* stats) - : HOptimization(graph, kInstructionSimplifierArm64PassName, stats) {} - static constexpr const char* kInstructionSimplifierArm64PassName - = "instruction_simplifier_arm64"; + : HOptimization(graph, kInstructionSimplifierArm64PassName, stats) {} + + static constexpr const char* kInstructionSimplifierArm64PassName = "instruction_simplifier_arm64"; + void Run() OVERRIDE { InstructionSimplifierArm64Visitor visitor(graph_, stats_); visitor.VisitReversePostOrder(); -- cgit v1.2.3-59-g8ed1b