diff options
| author | 2015-06-04 17:17:45 +0000 | |
|---|---|---|
| committer | 2015-06-04 17:17:45 +0000 | |
| commit | 6a1c92f1e4a455d802ab0d0ac47504cdd7c12f0f (patch) | |
| tree | 4804c678aecf7be4e77b4fa4adaddebe421095f3 /compiler/optimizing/nodes.h | |
| parent | 8a9fba9154310ddc8024150ca8cd5a7c4b76b71b (diff) | |
| parent | c345f141f11faad177aa9635a78088d00cf66086 (diff) | |
Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Diffstat (limited to 'compiler/optimizing/nodes.h')
| -rw-r--r-- | compiler/optimizing/nodes.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index d914363688..47927340f4 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -2528,9 +2528,7 @@ class HInvokeStaticOrDirect : public HInvoke { ClinitCheckRequirement clinit_check_requirement) : HInvoke(arena, number_of_arguments, - // There is one extra argument for the HCurrentMethod node, and - // potentially one other if the clinit check is explicit. - clinit_check_requirement == ClinitCheckRequirement::kExplicit ? 2u : 1u, + clinit_check_requirement == ClinitCheckRequirement::kExplicit ? 1u : 0u, return_type, dex_pc, dex_method_index, @@ -2552,7 +2550,6 @@ class HInvokeStaticOrDirect : public HInvoke { bool NeedsDexCache() const OVERRIDE { return !IsRecursive(); } bool IsStringInit() const { return string_init_offset_ != 0; } int32_t GetStringInitOffset() const { return string_init_offset_; } - uint32_t GetCurrentMethodInputIndex() const { return GetNumberOfArguments(); } // Is this instruction a call to a static method? bool IsStatic() const { |