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 1dee98b9f425c35cf660277a488e772c8de1a18b..7647d24ae98508744090b62b5c2e4a2b85abc10f 100644 |
--- a/src/compiler/mips/code-generator-mips.cc |
+++ b/src/compiler/mips/code-generator-mips.cc |
@@ -1138,9 +1138,24 @@ void CodeGenerator::AssembleMove(InstructionOperand* source, |
case Constant::kExternalReference: |
__ li(dst, Operand(src.ToExternalReference())); |
break; |
- case Constant::kHeapObject: |
- __ li(dst, src.ToHeapObject()); |
+ 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)); |
+ } else { |
+ __ li(dst, src_object); |
+ } |
break; |
+ } |
case Constant::kRpoNumber: |
UNREACHABLE(); // TODO(titzer): loading RPO numbers on mips. |
break; |