diff options
| author | 2015-11-09 10:14:35 +0000 | |
|---|---|---|
| committer | 2015-11-09 10:14:35 +0000 | |
| commit | 3e5b3c982a5837384829ffd6726c5a30714cbfcb (patch) | |
| tree | 0ad109f906aaf8d427bd6ed6ba2e9f50a348016b /compiler/optimizing/builder.cc | |
| parent | 2649cba0fb7cdbd8fa60cb4f2fb320fb2b18ee37 (diff) | |
| parent | b554b5a5ae3cdc66969d61be20783a8af816206e (diff) | |
Merge "Optimizing: Remove unused ArtMethod* input from HInvokeStaticOrDirect."
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 676e56477e..167c35d075 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -998,7 +998,9 @@ bool HGraphBuilder::SetupInvokeArguments(HInvoke* invoke, return false; } - if (invoke->IsInvokeStaticOrDirect()) { + if (invoke->IsInvokeStaticOrDirect() && + HInvokeStaticOrDirect::NeedsCurrentMethodInput( + invoke->AsInvokeStaticOrDirect()->GetMethodLoadKind())) { invoke->SetArgumentAt(*argument_index, graph_->GetCurrentMethod()); (*argument_index)++; } |