diff options
| author | 2023-04-25 15:45:29 +0000 | |
|---|---|---|
| committer | 2023-04-26 09:23:09 +0000 | |
| commit | 9dd046df6d6cd040e17e385940758020c5af438e (patch) | |
| tree | 470361d64b408ec6c7037b84c5f50546f33690b2 /compiler/optimizing | |
| parent | c0e1321bbc8c809393936e1f5e948c1fd5f642f3 (diff) | |
Fix `HDeoptimize::InstructionDataEquals()`.
The original code introduced in
https://android-review.googlesource.com/355337
was technically correct because `HDeoptimize` had its own
`GetKind()` function which was hiding the one from the base
class. However, that function was renamed in
https://android-review.googlesource.com/391053
without updating the `InstructionDataEquals()`.
Test: m test-art-host-gtest
Change-Id: Idfb35bd935858a50d16bd6ea0237ba1230787158
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/nodes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index e562d7e901..d13a8c31ac 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -3639,7 +3639,8 @@ class HDeoptimize final : public HVariableInputSizeInstruction { bool CanBeMoved() const override { return GetPackedFlag<kFieldCanBeMoved>(); } bool InstructionDataEquals(const HInstruction* other) const override { - return (other->CanBeMoved() == CanBeMoved()) && (other->AsDeoptimize()->GetKind() == GetKind()); + return (other->CanBeMoved() == CanBeMoved()) && + (other->AsDeoptimize()->GetDeoptimizationKind() == GetDeoptimizationKind()); } bool NeedsEnvironment() const override { return true; } |