Index: src/arm/assembler-arm-inl.h |
diff --git a/src/arm/assembler-arm-inl.h b/src/arm/assembler-arm-inl.h |
index b2ab940bd2c01a6e5f4d6384e4261c83439be3df..b5a59bb47646946681017cf703e08e1d7fa2209c 100644 |
--- a/src/arm/assembler-arm-inl.h |
+++ b/src/arm/assembler-arm-inl.h |
@@ -400,7 +400,11 @@ |
bool Assembler::is_constant_pool_load(Address pc) { |
- return IsLdrPcImmediateOffset(Memory::int32_at(pc)); |
+ if (CpuFeatures::IsSupported(ARMv7)) { |
+ return !Assembler::IsMovW(Memory::int32_at(pc)); |
+ } else { |
+ return !Assembler::IsMovImmed(Memory::int32_at(pc)); |
+ } |
} |