commit 8b8d93d16ce2b409b27b4655bad0ee41987cb06d
author Nicolas Geoffray <ngeoffray@google.com> Thu Sep 17 14:30:01 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri Sep 18 08:37:07 2020 +0000
tree 947ca0d8507b5860de45659c79e1cfafa7b1c305
parent eb2c9dd52679d590428a33556f45fb49eaef5e0e

Use kTieredHotnessMask in arm32 and x86 baseline backends.

Those backends were missed when introducing kTieredHotnessMask.

Test: test.py

Change-Id: If72c00f4c1c7d668e0cd360773313c3717fd9456

compiler/optimizing/code_generator_arm_vixl.cc

diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index dce6528..88551e0 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -30,6 +30,7 @@
 #include "gc/accounting/card_table.h"
 #include "gc/space/image_space.h"
 #include "heap_poisoning.h"
+#include "interpreter/mterp/nterp.h"
 #include "intrinsics.h"
 #include "intrinsics_arm_vixl.h"
 #include "linker/linker_patch.h"
@@ -2119,6 +2120,7 @@
       __ Mov(r4, address);
       __ Ldrh(ip, MemOperand(r4, ProfilingInfo::BaselineHotnessCountOffset().Int32Value()));
       __ Add(ip, ip, 1);
+      instruction_visitor_.GenerateAndConst(ip, ip, interpreter::kTieredHotnessMask);
       __ Strh(ip, MemOperand(r4, ProfilingInfo::BaselineHotnessCountOffset().Int32Value()));
       if (!is_frame_entry) {
         __ Pop(r4);