| Index: runtime/vm/assembler_x64.cc
|
| diff --git a/runtime/vm/assembler_x64.cc b/runtime/vm/assembler_x64.cc
|
| index 913020a676565fb803d8d6713fe26505688ca73b..66b36d0acc8d951281f2352455e6baf4ad27d34f 100644
|
| --- a/runtime/vm/assembler_x64.cc
|
| +++ b/runtime/vm/assembler_x64.cc
|
| @@ -2834,10 +2834,14 @@ void Assembler::LoadIsolate(Register dst) {
|
| }
|
|
|
|
|
| -void Assembler::LoadObject(Register dst, const Object& object, Register pp) {
|
| +void Assembler::LoadObjectHelper(Register dst,
|
| + const Object& object,
|
| + Register pp,
|
| + bool is_unique) {
|
| if (CanLoadFromObjectPool(object)) {
|
| - const int32_t offset =
|
| - ObjectPool::element_offset(object_pool_wrapper_.FindObject(object));
|
| + const int32_t offset = ObjectPool::element_offset(
|
| + is_unique ? object_pool_wrapper_.AddObject(object)
|
| + : object_pool_wrapper_.FindObject(object));
|
| LoadWordFromPoolOffset(dst, pp, offset - kHeapObjectTag);
|
| } else {
|
| ASSERT((Isolate::Current() == Dart::vm_isolate()) ||
|
| @@ -2848,6 +2852,18 @@ void Assembler::LoadObject(Register dst, const Object& object, Register pp) {
|
| }
|
|
|
|
|
| +void Assembler::LoadObject(Register dst, const Object& object, Register pp) {
|
| + LoadObjectHelper(dst, object, pp, false);
|
| +}
|
| +
|
| +
|
| +void Assembler::LoadUniqueObject(Register dst,
|
| + const Object& object,
|
| + Register pp) {
|
| + LoadObjectHelper(dst, object, pp, true);
|
| +}
|
| +
|
| +
|
| void Assembler::StoreObject(const Address& dst, const Object& object,
|
| Register pp) {
|
| if (CanLoadFromObjectPool(object)) {
|
|
|