[turbofan] Disallow cross native context inlining.

[turbofan] Disallow cross native context inlining.

R=jarin@chromium.org

Committed: https://crrev.com/44ea5fbf9509406ba06274162bf7b8eb36a6ba9a
Cr-Commit-Position: refs/heads/master@{#29376}

[Benedikt Meurer, 2015-06-30 10:44:31]

Hey Jaro,

Another obvious one. Please take a look.

Thanks,
Benedikt

[Jarin, 2015-06-30 10:45:27]

lgtm

[Benedikt Meurer, 2015-06-30 10:45:40]

The CQ bit was checked by bmeurer@chromium.org

[commit-bot: I haz the power, 2015-06-30 10:45:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1213383002/1

[commit-bot: I haz the power, 2015-06-30 11:09:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-30 11:09:53]

Failed to apply patch for src/compiler/js-inlining.cc:
While running git apply --index -3 -p1;
  error: patch failed: src/compiler/js-inlining.cc:251
  Falling back to three-way merge...
  Applied patch to 'src/compiler/js-inlining.cc' with conflicts.
  U src/compiler/js-inlining.cc

Patch:       src/compiler/js-inlining.cc
Index: src/compiler/js-inlining.cc
diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc
index
6d7de1d30df21621c02dda5590a722d387eb5dff..83de86428f816577b72bc08f123e15e9d1a85662
100644
--- a/src/compiler/js-inlining.cc
+++ b/src/compiler/js-inlining.cc
@@ -251,6 +251,22 @@ Reduction JSInliner::Reduce(Node* node) {
     return NoChange();
   }
 
+  // Disallow cross native-context inlining for now. This means that all parts
+  // of the resulting code will operate on the same global object.
+  // This also prevents cross context leaks for asm.js code, where we could
+  // inline functions from a different context and hold on to that context (and
+  // closure) from the code object.
+  // TODO(turbofan): We might want to revisit this restriction later when we
+  // have a need for this, and we know how to model different native contexts
+  // in the same graph in a compositional way.
+  if (function->context()->native_context() !=
+      info_->context()->native_context()) {
+    TRACE("Not inlining %s into %s because of different native contexts\n",
+          function->shared()->DebugName()->ToCString().get(),
+          info_->shared_info()->DebugName()->ToCString().get());
+    return NoChange();
+  }
+
   Zone zone;
   ParseInfo parse_info(&zone, function);
   CompilationInfo info(&parse_info);
@@ -261,7 +277,7 @@ Reduction JSInliner::Reduce(Node* node) {
 
   if (info.scope()->arguments() != NULL && is_sloppy(info.language_mode())) {
     // For now do not inline functions that use their arguments array.
-    TRACE("Not Inlining %s into %s because inlinee uses arguments array\n",
+    TRACE("Not inlining %s into %s because inlinee uses arguments array\n",
           function->shared()->DebugName()->ToCString().get(),
           info_->shared_info()->DebugName()->ToCString().get());
     return NoChange();

[Benedikt Meurer, 2015-06-30 11:11:28]

The CQ bit was checked by bmeurer@chromium.org

[Benedikt Meurer, 2015-06-30 11:11:29]

The patchset sent to the CQ was uploaded after l-g-t-m from jarin@chromium.org
Link to the patchset: https://codereview.chromium.org/1213383002/#ps20001
(title: "REBASE")

[commit-bot: I haz the power, 2015-06-30 11:11:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1213383002/20001

[commit-bot: I haz the power, 2015-06-30 11:38:25]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-06-30 11:38:43]

Patchset 2 (id:??) landed as
https://crrev.com/44ea5fbf9509406ba06274162bf7b8eb36a6ba9a
Cr-Commit-Position: refs/heads/master@{#29376}