From f25a0e493ecc9e7613343711deca235fc8e704be Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 21 Dec 2023 16:41:51 +0000 Subject: Revert "Use GetCurrentMethod to get the current method when tracing" This reverts commit a4fd8bb141fdb877bfd0d69700dad4e2859634a7. Bug: 259258187 Reason for revert: Failures on bots: https://ci.chromium.org/ui/p/art/builders/ci/angler-armv8-non-gen-cc/3617/overview Change-Id: Ia4aa3532b137d9022853a9f82ef6bacc9246d0ce --- compiler/optimizing/nodes.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index fceff877f1..d84ff7be73 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -3059,12 +3059,10 @@ class HExpression<0> : public HInstruction { friend class SsaBuilder; }; -class HMethodEntryHook : public HExpression<1> { +class HMethodEntryHook : public HExpression<0> { public: - HMethodEntryHook(HInstruction* method, uint32_t dex_pc) - : HExpression(kMethodEntryHook, SideEffects::All(), dex_pc) { - SetRawInputAt(0, method); - } + explicit HMethodEntryHook(uint32_t dex_pc) + : HExpression(kMethodEntryHook, SideEffects::All(), dex_pc) {} bool NeedsEnvironment() const override { return true; @@ -3078,12 +3076,11 @@ class HMethodEntryHook : public HExpression<1> { DEFAULT_COPY_CONSTRUCTOR(MethodEntryHook); }; -class HMethodExitHook : public HExpression<2> { +class HMethodExitHook : public HExpression<1> { public: - HMethodExitHook(HInstruction* method, HInstruction* value, uint32_t dex_pc) + HMethodExitHook(HInstruction* value, uint32_t dex_pc) : HExpression(kMethodExitHook, SideEffects::All(), dex_pc) { - SetRawInputAt(0, method); - SetRawInputAt(1, value); + SetRawInputAt(0, value); } bool NeedsEnvironment() const override { -- cgit v1.2.3-59-g8ed1b