commit f4da60751631f8bc098fbd04517f305bf7f20ae3
author Ian Rogers <irogers@google.com> Fri Apr 26 22:53:05 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 26 22:53:05 2013 +0000
tree 5a359b033ee308154ffbdcfea47708bacd1c9cb3
parent b0682d5f7970470130f43d35f37ae7605a8a9bb8

Revert "Supporting de-virtualization for precise types."

This reverts commit b0682d5f7970470130f43d35f37ae7605a8a9bb8

Change-Id: I2b0dc3e716ee5c23b89d9fa6eb0ef05c24784b3e

src/compiler/dex/mir_dataflow.cc

diff --git a/src/compiler/dex/mir_dataflow.cc b/src/compiler/dex/mir_dataflow.cc
index 444874d..23bf248 100644
--- a/src/compiler/dex/mir_dataflow.cc
+++ b/src/compiler/dex/mir_dataflow.cc
@@ -1249,13 +1249,11 @@
   int vtable_idx;
   uintptr_t direct_code;
   uintptr_t direct_method;
-  uint32_t current_offset = static_cast<uint32_t>(current_offset_);
   bool fast_path =
-      cu_->compiler_driver->ComputeInvokeInfo(dex_method_idx, current_offset,
-                                              &m_unit, type,
-                                              vtable_idx, direct_code,
-                                              direct_method) &&
-                                              !(cu_->enable_debug & (1 << kDebugSlowInvokePath));
+      cu_->compiler_driver->ComputeInvokeInfo(dex_method_idx, &m_unit, type,
+                                             vtable_idx, direct_code,
+                                             direct_method) &&
+                                             !(cu_->enable_debug & (1 << kDebugSlowInvokePath));
   return (((type == kDirect) || (type == kStatic)) &&
           fast_path && ((direct_code == 0) || (direct_method == 0)));
 }

src/compiler/dex/quick/gen_invoke.cc

diff --git a/src/compiler/dex/quick/gen_invoke.cc b/src/compiler/dex/quick/gen_invoke.cc
index efacff0..2eab673 100644
--- a/src/compiler/dex/quick/gen_invoke.cc
+++ b/src/compiler/dex/quick/gen_invoke.cc
@@ -1329,7 +1329,7 @@
   uintptr_t direct_method;
   bool skip_this;
   bool fast_path = cu_->compiler_driver->ComputeInvokeInfo(
-      dex_method_idx, current_dalvik_offset_, mir_graph_->GetCurrentDexCompilationUnit(), info->type, vtable_idx,
+      dex_method_idx, mir_graph_->GetCurrentDexCompilationUnit(), info->type, vtable_idx,
       direct_code, direct_method) && !SLOW_INVOKE_PATH;
   if (info->type == kInterface) {
     if (fast_path) {