Inline functions with different contexts in the optimizing code generator.

src/hydrogen.h

Index: src/hydrogen.h
diff --git a/src/hydrogen.h b/src/hydrogen.h
index 3b586ff2071e4ec891076988019c057beba722a5..28057d8f716536c433df05c51fef773eeb819224 100644
--- a/src/hydrogen.h
+++ b/src/hydrogen.h
@@ -425,7 +425,8 @@ class HEnvironment: public ZoneObject {
   HEnvironment* CopyForInlining(Handle<JSFunction> target,
                                 FunctionLiteral* function,
                                 HConstant* undefined,
-                                CallKind call_kind) const;
+                                CallKind call_kind,
+                                bool context_change) const;
 
   void AddIncomingEdge(HBasicBlock* block, HEnvironment* other);
 
@@ -693,6 +694,12 @@ class HGraphBuilder: public AstVisitor {
     BreakAndContinueScope* next_;
   };
 
+#ifdef V8_TARGET_ARCH_IA32
+  static const bool kInlineContextChangeAllowed = true;
+#else
+  static const bool kInlineContextChangeAllowed = false;
+#endif
+
   HGraphBuilder(CompilationInfo* info, TypeFeedbackOracle* oracle);
 
   HGraph* CreateGraph();