From c05aca78fad20901ae17902a3671ccfca9071758 Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Tue, 13 Oct 2015 13:10:33 +0000
Subject: Revert "optimizing: propagate type information of arguments"

This reverts commit 2c1ffc3a06e9ed0411e29e7dc2558b5d657ede7a.

Change-Id: I3291070c373e661fa578f5a38becbb5a502baf94
---
 compiler/optimizing/builder.cc | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'compiler/optimizing/builder.cc')

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index eb55ebc117..503d08f6f5 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -159,13 +159,9 @@ void HGraphBuilder::InitializeParameters(uint16_t number_of_parameters) {
   int locals_index = locals_.size() - number_of_parameters;
   int parameter_index = 0;
 
-  const DexFile::MethodId& referrer_method_id =
-      dex_file_->GetMethodId(dex_compilation_unit_->GetDexMethodIndex());
   if (!dex_compilation_unit_->IsStatic()) {
     // Add the implicit 'this' argument, not expressed in the signature.
-    HParameterValue* parameter = new (arena_) HParameterValue(*dex_file_,
-                                                              referrer_method_id.class_idx_,
-                                                              parameter_index++,
+    HParameterValue* parameter = new (arena_) HParameterValue(parameter_index++,
                                                               Primitive::kPrimNot,
                                                               true);
     entry_block_->AddInstruction(parameter);
@@ -174,16 +170,11 @@ void HGraphBuilder::InitializeParameters(uint16_t number_of_parameters) {
     number_of_parameters--;
   }
 
-  const DexFile::ProtoId& proto = dex_file_->GetMethodPrototype(referrer_method_id);
-  const DexFile::TypeList* arg_types = dex_file_->GetProtoParameters(proto);
-  for (int i = 0, shorty_pos = 1; i < number_of_parameters; i++) {
-    HParameterValue* parameter = new (arena_) HParameterValue(
-        *dex_file_,
-        arg_types->GetTypeItem(shorty_pos - 1).type_idx_,
-        parameter_index++,
-        Primitive::GetType(shorty[shorty_pos]),
-        false);
-    ++shorty_pos;
+  uint32_t pos = 1;
+  for (int i = 0; i < number_of_parameters; i++) {
+    HParameterValue* parameter = new (arena_) HParameterValue(parameter_index++,
+                                                              Primitive::GetType(shorty[pos++]),
+                                                              false);
     entry_block_->AddInstruction(parameter);
     HLocal* local = GetLocalAt(locals_index++);
     // Store the parameter value in the local that the dex code will use
-- 
cgit v1.2.3-59-g8ed1b