From e3bc035727b65370d5e30ac853c673d0ec2cb80a Mon Sep 17 00:00:00 2001
From: Samuel Reed <samuel.trace.reed@gmail.com>
Date: Wed, 18 Jan 2017 12:20:45 -0600
Subject: [PATCH] Fix PathHoister hoisting before bindings.

Fixes #5149 and enables a few additional safe hoists.
---
 .../expected.js                               | 17 +++---
 .../expected.js                               | 18 +++---
 .../dont-hoist-before-class/actual.js         | 15 +++++
 .../dont-hoist-before-class/expected.js       | 13 +++++
 .../dont-hoist-before-declaration/expected.js |  5 +-
 .../dont-hoist-before-hoc/actual.js           | 18 ++++++
 .../dont-hoist-before-hoc/expected.js         | 18 ++++++
 .../babel-traverse/src/path/lib/hoister.js    | 55 +++++++++++++------
 8 files changed, 123 insertions(+), 36 deletions(-)
 create mode 100644 packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/actual.js
 create mode 100644 packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/expected.js
 create mode 100644 packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/actual.js
 create mode 100644 packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/expected.js

diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope-3/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope-3/expected.js
index cceca3a5e883..46849febf69f 100644
--- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope-3/expected.js
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope-3/expected.js
@@ -1,18 +1,19 @@
-var _ref = <p>Parent</p>;
-
 var _ref2 = <div>child</div>;
 
+var _ref3 = <p>Parent</p>;
+
 (function () {
   class App extends React.Component {
     render() {
-      return <div>
-          {_ref}
-          <AppItem />
-        </div>;
+      return _ref;
     }
   }
 
   const AppItem = () => {
     return _ref2;
-  };
-});
+  },
+        _ref = <div>
+          {_ref3}
+          <AppItem />
+        </div>;
+});
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope/expected.js
index 5fc826084567..fe04d4853fea 100644
--- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope/expected.js
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/append-to-end-when-declared-in-scope/expected.js
@@ -1,16 +1,14 @@
-var _ref = <p>Parent</p>;
-
 export default class App extends React.Component {
   render() {
-    return <div>
-        {_ref}
-        <AppItem />
-      </div>;
+    return _ref;
   }
 }
 
-var _ref2 = <div>child</div>;
-
-const AppItem = () => {
+const _ref2 = <div>child</div>,
+      AppItem = () => {
   return _ref2;
-};
+},
+      _ref = <div>
+        <p>Parent</p>
+        <AppItem />
+      </div>;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/actual.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/actual.js
new file mode 100644
index 000000000000..0bcdd9ef7c39
--- /dev/null
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/actual.js
@@ -0,0 +1,15 @@
+import React from "react";
+
+const Parent = ({}) => (
+  <div className="parent">
+    <Child/>
+  </div>
+);
+
+export default Parent;
+
+let Child = () => (
+  <div className="child">
+    ChildTextContent
+  </div>
+);
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/expected.js
new file mode 100644
index 000000000000..6bcd6e0ffbd8
--- /dev/null
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-class/expected.js
@@ -0,0 +1,13 @@
+import React from "react";
+
+const Parent = ({}) => _ref;
+
+export default Parent;
+
+let _ref2 = <div className="child">
+    ChildTextContent
+  </div>,
+    Child = () => _ref2,
+    _ref = <div className="parent">
+    <Child />
+  </div>;
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-declaration/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-declaration/expected.js
index d85f9f3244c6..45b91bd2961c 100644
--- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-declaration/expected.js
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-declaration/expected.js
@@ -8,8 +8,9 @@ function render() {
 
 function render() {
   const bar = "bar",
-        renderFoo = () => <foo bar={bar} baz={baz} />,
-        baz = "baz";
+        renderFoo = () => _ref2,
+        baz = "baz",
+        _ref2 = <foo bar={bar} baz={baz} />;
 
   return renderFoo();
 }
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/actual.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/actual.js
new file mode 100644
index 000000000000..21f7b2ed905d
--- /dev/null
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/actual.js
@@ -0,0 +1,18 @@
+import React from "react";
+
+const HOC = component => component;
+
+const Parent = ({}) => (
+  <div className="parent">
+    <Child/>
+  </div>
+);
+
+export default Parent;
+
+let Child = () => (
+  <div className="child">
+    ChildTextContent
+  </div>
+);
+Child = HOC(Child);
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/expected.js
new file mode 100644
index 000000000000..8da0cc5ad12f
--- /dev/null
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-hoc/expected.js
@@ -0,0 +1,18 @@
+import React from "react";
+
+const HOC = component => component;
+
+const Parent = ({}) => _ref;
+
+export default Parent;
+
+var _ref2 = <div className="child">
+    ChildTextContent
+  </div>;
+
+let Child = () => _ref2;
+Child = HOC(Child);
+
+var _ref = <div className="parent">
+    <Child />
+  </div>;
\ No newline at end of file
diff --git a/packages/babel-traverse/src/path/lib/hoister.js b/packages/babel-traverse/src/path/lib/hoister.js
index 8a36031f1e79..95d631e8e8ba 100644
--- a/packages/babel-traverse/src/path/lib/hoister.js
+++ b/packages/babel-traverse/src/path/lib/hoister.js
@@ -15,25 +15,27 @@ const referenceVisitor = {
     // eg. it's in a closure etc
     if (binding !== state.scope.getBinding(path.node.name)) return;
 
-    if (binding.constant) {
-      state.bindings[path.node.name] = binding;
-    } else {
-      for (const violationPath of (binding.constantViolations: Array)) {
-        state.breakOnScopePaths = state.breakOnScopePaths.concat(violationPath.getAncestry());
-      }
-    }
+    state.bindings[path.node.name] = binding;
   }
 };
 
 export default class PathHoister {
   constructor(path, scope) {
+    // Storage for scopes we can't hoist above.
     this.breakOnScopePaths = [];
+    // Storage for bindings that may affect what path we can hoist to.
     this.bindings          = {};
+    // Storage for eligible scopes.
     this.scopes            = [];
+    // Our original scope and path.
     this.scope             = scope;
     this.path              = path;
+    // By default, we attach as far up as we can; but if we're trying
+    // to avoid referencing a binding, we may have to go after.
+    this.attachAfter       = false;
   }
 
+  // A scope is compatible if all required bindings are reachable.
   isCompatibleScope(scope) {
     for (const key in this.bindings) {
       const binding = this.bindings[key];
@@ -45,6 +47,7 @@ export default class PathHoister {
     return true;
   }
 
+  // Look through all scopes and push compatible ones.
   getCompatibleScopes() {
     let scope = this.path.scope;
     do {
@@ -54,6 +57,7 @@ export default class PathHoister {
         break;
       }
 
+      // deopt: These scopes are set in the visitor on const violations
       if (this.breakOnScopePaths.indexOf(scope.path) >= 0) {
         break;
       }
@@ -61,7 +65,7 @@ export default class PathHoister {
   }
 
   getAttachmentPath() {
-    const path = this._getAttachmentPath();
+    let path = this._getAttachmentPath();
     if (!path) return;
 
     let targetScope = path.scope;
@@ -82,8 +86,18 @@ export default class PathHoister {
         // allow parameter references
         if (binding.kind === "param") continue;
 
-        // if this binding appears after our attachment point then don't hoist it
-        if (this.getAttachmentParentForPath(binding.path).key > path.key) return;
+        // if this binding appears after our attachment point, then we move after it.
+        if (this.getAttachmentParentForPath(binding.path).key > path.key) {
+          this.attachAfter = true;
+          path = binding.path;
+
+          // We also move past any constant violations.
+          for (const violationPath of (binding.constantViolations: Array)) {
+            if (this.getAttachmentParentForPath(violationPath).key > path.key) {
+              path = violationPath;
+            }
+          }
+        }
       }
     }
 
@@ -94,11 +108,12 @@ export default class PathHoister {
     const scopes = this.scopes;
 
     const scope = scopes.pop();
+    // deopt: no compatible scopes
     if (!scope) return;
 
     if (scope.path.isFunction()) {
       if (this.hasOwnParamBindings(scope)) {
-        // should ignore this scope since it's ourselves
+        // deopt: should ignore this scope since it's ourselves
         if (this.scope === scope) return;
 
         // needs to be attached to the body
@@ -117,21 +132,28 @@ export default class PathHoister {
     if (scope) return this.getAttachmentParentForPath(scope.path);
   }
 
+  // Find an attachment for this path.
   getAttachmentParentForPath(path) {
     do {
-      if (!path.parentPath ||
-          (Array.isArray(path.container) && path.isStatement()) ||
-          (path.isVariableDeclarator() && path.parentPath.node.declarations.length > 1))
+      if (
+        // Beginning of the scope
+        !path.parentPath ||
+        // Has siblings and is a statement
+        (Array.isArray(path.container) && path.isStatement()) ||
+        // Is part of multiple var declarations
+        (path.isVariableDeclarator() && path.parentPath.node.declarations.length > 1))
         return path;
     } while ((path = path.parentPath));
   }
 
+  // Returns true if a scope has param bindings.
   hasOwnParamBindings(scope) {
     for (const name in this.bindings) {
       if (!scope.hasOwnBinding(name)) continue;
 
       const binding = this.bindings[name];
-      if (binding.kind === "param") return true;
+      // Ensure constant; without it we could place behind a reassignment
+      if (binding.kind === "param" && binding.constant) return true;
     }
     return false;
   }
@@ -155,7 +177,8 @@ export default class PathHoister {
     let uid = attachTo.scope.generateUidIdentifier("ref");
     const declarator = t.variableDeclarator(uid, this.path.node);
 
-    attachTo.insertBefore([
+    const insertFn = this.attachAfter ? "insertAfter" : "insertBefore";
+    attachTo[insertFn]([
       attachTo.isVariableDeclarator() ? declarator : t.variableDeclaration("var", [declarator])
     ]);