| Index: runtime/vm/flow_graph_compiler_ia32.cc
|
| diff --git a/runtime/vm/flow_graph_compiler_ia32.cc b/runtime/vm/flow_graph_compiler_ia32.cc
|
| index ce869b63655001b27b247f4d702d4bcb49babb67..6ecfe790c10af2c7fbc78937f50ac4bcd4cc11fc 100644
|
| --- a/runtime/vm/flow_graph_compiler_ia32.cc
|
| +++ b/runtime/vm/flow_graph_compiler_ia32.cc
|
| @@ -1770,7 +1770,7 @@ void ParallelMoveResolver::EmitMove(int index) {
|
| if (constant.IsSmi() && (Smi::Cast(constant).Value() == 0)) {
|
| __ xorl(destination.reg(), destination.reg());
|
| } else {
|
| - __ LoadObject(destination.reg(), constant);
|
| + __ LoadObjectSafely(destination.reg(), constant);
|
| }
|
| } else {
|
| ASSERT(destination.IsStackSlot());
|
| @@ -1869,11 +1869,11 @@ void ParallelMoveResolver::MoveMemoryToMemory(const Address& dst,
|
|
|
|
|
| void ParallelMoveResolver::StoreObject(const Address& dst, const Object& obj) {
|
| - if (obj.IsSmi() || obj.IsNull()) {
|
| + if (Assembler::IsSafeSmi(obj) || obj.IsNull()) {
|
| __ movl(dst, Immediate(reinterpret_cast<int32_t>(obj.raw())));
|
| } else {
|
| ScratchRegisterScope ensure_scratch(this, kNoRegister);
|
| - __ LoadObject(ensure_scratch.reg(), obj);
|
| + __ LoadObjectSafely(ensure_scratch.reg(), obj);
|
| __ movl(dst, ensure_scratch.reg());
|
| }
|
| }
|
|
|