| Index: src/compiler/mips/code-generator-mips.cc
|
| diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc
|
| index 7647d24ae98508744090b62b5c2e4a2b85abc10f..98115b46e72f8646c06a51256661d19da7e22cfb 100644
|
| --- a/src/compiler/mips/code-generator-mips.cc
|
| +++ b/src/compiler/mips/code-generator-mips.cc
|
| @@ -1140,17 +1140,12 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
|
| break;
|
| case Constant::kHeapObject: {
|
| Handle<HeapObject> src_object = src.ToHeapObject();
|
| - if (info()->IsOptimizing() &&
|
| - src_object.is_identical_to(info()->context())) {
|
| - // Loading the context from the frame is way cheaper than
|
| - // materializing the actual context heap object address.
|
| - __ lw(dst, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| - } else if (info()->IsOptimizing() &&
|
| - src_object.is_identical_to(info()->closure())) {
|
| - // Loading the JSFunction from the frame is way cheaper than
|
| - // materializing the actual JSFunction heap object address.
|
| - __ lw(dst,
|
| - MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| + Heap::RootListIndex index;
|
| + int offset;
|
| + if (IsMaterializableFromFrame(src_object, &offset)) {
|
| + __ lw(dst, MemOperand(fp, offset));
|
| + } else if (IsMaterializableFromRoot(src_object, &index)) {
|
| + __ LoadRoot(dst, index);
|
| } else {
|
| __ li(dst, src_object);
|
| }
|
|
|