From 096cc029451f4d48a79361ec206b6a7f3f58dd7c Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Thu, 23 Oct 2014 17:01:13 +0100
Subject: [optimizing compiler] Handle SUB_FLOAT/DOUBLE nodes

Also add 414-optimizing-arith-sub to
TEST_ART_BROKEN_OPTIMIZING_ARM64_RUN_TESTS.

Change-Id: Ia1b7ff7857bc0e488b9b8ed8a36efb1a3a9bad36
---
 compiler/optimizing/builder.cc | 20 ++++++++++++++++++++
 test/Android.run-test.mk       |  1 +
 2 files changed, 21 insertions(+)

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index f48f4c3990..79cbd0ee21 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -783,6 +783,16 @@ bool HGraphBuilder::AnalyzeDexInstruction(const Instruction& instruction, uint32
       break;
     }
 
+    case Instruction::SUB_FLOAT: {
+      Binop_23x<HSub>(instruction, Primitive::kPrimFloat);
+      break;
+    }
+
+    case Instruction::SUB_DOUBLE: {
+      Binop_23x<HSub>(instruction, Primitive::kPrimDouble);
+      break;
+    }
+
     case Instruction::ADD_INT_2ADDR: {
       Binop_12x<HAdd>(instruction, Primitive::kPrimInt);
       break;
@@ -833,6 +843,16 @@ bool HGraphBuilder::AnalyzeDexInstruction(const Instruction& instruction, uint32
       break;
     }
 
+    case Instruction::SUB_FLOAT_2ADDR: {
+      Binop_12x<HSub>(instruction, Primitive::kPrimFloat);
+      break;
+    }
+
+    case Instruction::SUB_DOUBLE_2ADDR: {
+      Binop_12x<HSub>(instruction, Primitive::kPrimDouble);
+      break;
+    }
+
     case Instruction::MUL_INT_2ADDR: {
       Binop_12x<HMul>(instruction, Primitive::kPrimInt);
       break;
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 9279ce38b5..682282532b 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -316,6 +316,7 @@ TEST_ART_BROKEN_OPTIMIZING_ARM64_RUN_TESTS := \
   411-optimizing-arith \
   412-new-array \
   413-regalloc-regression \
+  414-optimizing-arith-sub \
   700-LoadArgRegs \
   800-smali
 
-- 
cgit v1.2.3-59-g8ed1b