Inline functions with different contexts in the optimizing code generator.

src/arm/lithium-arm.cc

Index: src/arm/lithium-arm.cc
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
index 30ccd05beecb39c979a4dbe91ee301d381390d7d..6f7f54485891bd874209c7453a6cb4c8c55f958f 100644
--- a/src/arm/lithium-arm.cc
+++ b/src/arm/lithium-arm.cc
@@ -1109,6 +1109,15 @@ LInstruction* LChunkBuilder::DoContext(HContext* instr) {
 }
 
 
+LInstruction* LChunkBuilder::DoInlinedContext(HInlinedContext* instr) {
+  // All implicit uses of the context from the context register or from
+  // the stack frame must be replaced with uses of HContext values
+  // before HInlinedContext will work.
+  UNREACHABLE();
+  return instr->HasNoUses() ? NULL : DefineAsRegister(new LInlinedContext);

[Kevin Millikin (Chromium), 2011/09/15 11:17:24]

Just UNREACHABLE, please, no untested dead code.

Otherwise it's too tempting to think deleting UNREACHABLE() will make everything
work.  That might not be true in three or six months.

+}
+
+
 LInstruction* LChunkBuilder::DoOuterContext(HOuterContext* instr) {
   LOperand* context = UseRegisterAtStart(instr->value());
   return DefineAsRegister(new LOuterContext(context));
@@ -2166,7 +2175,8 @@ LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) {
   HEnvironment* inner = outer->CopyForInlining(instr->closure(),
                                                instr->function(),
                                                undefined,
-                                               instr->call_kind());
+                                               instr->call_kind(),
+                                               instr->context_changed());
   current_block_->UpdateEnvironment(inner);
   chunk_->AddInlinedClosure(instr->closure());
   return NULL;