commit 7b0e353b49ac3f464c662f20e20e240f0231afff
author Nicolas Geoffray <ngeoffray@google.com> Tue Jun 09 09:25:50 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jun 09 09:25:50 2015 +0000
tree b5c936df891b08521176065ccaddb1f9e27c9f46
parent e21aa42e1341d34250742abafdd83311ad9fa737

Revert "Pass current method to HNewInstance and HNewArray."

082-inline-execute fails on x86.

This reverts commit e21aa42e1341d34250742abafdd83311ad9fa737.

Change-Id: Ib3fd25faee2e0128001e40d3d51a74f959bc4449

compiler/optimizing/nodes.h

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index f87775e..d914363 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -2668,10 +2668,9 @@
   DISALLOW_COPY_AND_ASSIGN(HInvokeInterface);
 };
 
-class HNewInstance : public HExpression<1> {
+class HNewInstance : public HExpression<0> {
  public:
-  HNewInstance(HCurrentMethod* current_method,
-               uint32_t dex_pc,
+  HNewInstance(uint32_t dex_pc,
                uint16_t type_index,
                const DexFile& dex_file,
                QuickEntrypointEnum entrypoint)
@@ -2679,9 +2678,7 @@
         dex_pc_(dex_pc),
         type_index_(type_index),
         dex_file_(dex_file),
-        entrypoint_(entrypoint) {
-    SetRawInputAt(0, current_method);
-  }
+        entrypoint_(entrypoint) {}
 
   uint32_t GetDexPc() const OVERRIDE { return dex_pc_; }
   uint16_t GetTypeIndex() const { return type_index_; }
@@ -2724,10 +2721,9 @@
   DISALLOW_COPY_AND_ASSIGN(HNeg);
 };
 
-class HNewArray : public HExpression<2> {
+class HNewArray : public HExpression<1> {
  public:
   HNewArray(HInstruction* length,
-            HCurrentMethod* current_method,
             uint32_t dex_pc,
             uint16_t type_index,
             const DexFile& dex_file,
@@ -2738,7 +2734,6 @@
         dex_file_(dex_file),
         entrypoint_(entrypoint) {
     SetRawInputAt(0, length);
-    SetRawInputAt(1, current_method);
   }
 
   uint32_t GetDexPc() const OVERRIDE { return dex_pc_; }