commit b554b5a5ae3cdc66969d61be20783a8af816206e
author Vladimir Marko <vmarko@google.com> Fri Nov 06 12:57:55 2015 +0000
committer Vladimir Marko <vmarko@google.com> Fri Nov 06 19:54:53 2015 +0000
tree c52c69c7e4a3950e4c24065c70b19eebdfc10f29
parent 2fa684206b0a8bd203d07e1edf74a839b498f74f

Optimizing: Remove unused ArtMethod* input from HInvokeStaticOrDirect.

Change-Id: Iea99fa683440673ff517e246f35fade96600f229

compiler/optimizing/builder.cc

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index ed193c7..6cc2c62 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -1006,7 +1006,9 @@
     return false;
   }
 
-  if (invoke->IsInvokeStaticOrDirect()) {
+  if (invoke->IsInvokeStaticOrDirect() &&
+      HInvokeStaticOrDirect::NeedsCurrentMethodInput(
+          invoke->AsInvokeStaticOrDirect()->GetMethodLoadKind())) {
     invoke->SetArgumentAt(*argument_index, graph_->GetCurrentMethod());
     (*argument_index)++;
   }