From d86ae2fb84f442c915174a23bef3097a26ed2819 Mon Sep 17 00:00:00 2001 From: Logan Smyth Date: Tue, 2 May 2017 13:14:56 -0700 Subject: [PATCH] Remove _blockHoist usage from param processing. --- .../babel-plugin-transform-es2015-parameters/src/params.js | 3 --- .../babel-plugin-transform-es2015-parameters/src/rest.js | 4 ---- .../babel-plugin-transform-object-rest-spread/src/index.js | 1 - .../dont-hoist-before-default-params/expected.js | 5 ++--- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/babel-plugin-transform-es2015-parameters/src/params.js b/packages/babel-plugin-transform-es2015-parameters/src/params.js index 99e80cc7f6..de87c35d8f 100644 --- a/packages/babel-plugin-transform-es2015-parameters/src/params.js +++ b/packages/babel-plugin-transform-es2015-parameters/src/params.js @@ -73,11 +73,9 @@ export default function convertFunctionParams(path) { DEFAULT_VALUE: right.node, ARGUMENT_KEY: t.numericLiteral(i), }); - defNode._blockHoist = node.params.length - i; body.push(defNode); } else if (firstOptionalIndex !== null) { const defNode = buildArgumentsAccess(param.node, t.numericLiteral(i)); - defNode._blockHoist = node.params.length - i; body.push(defNode); } else if (param.isObjectPattern() || param.isArrayPattern()) { const uid = path.scope.generateUidIdentifier("ref"); @@ -85,7 +83,6 @@ export default function convertFunctionParams(path) { const defNode = t.variableDeclaration("let", [ t.variableDeclarator(param.node, uid), ]); - defNode._blockHoist = node.params.length - i; body.push(defNode); param.replaceWith(uid); diff --git a/packages/babel-plugin-transform-es2015-parameters/src/rest.js b/packages/babel-plugin-transform-es2015-parameters/src/rest.js index 5463633259..4617f8f5d2 100644 --- a/packages/babel-plugin-transform-es2015-parameters/src/rest.js +++ b/packages/babel-plugin-transform-es2015-parameters/src/rest.js @@ -316,12 +316,8 @@ export default function convertFunctionRest(path) { }); if (state.deopted) { - loop._blockHoist = node.params.length + 1; node.body.body.unshift(loop); } else { - // perform allocation at the lowest common ancestor of all references - loop._blockHoist = 1; - let target = path .getEarliestCommonAncestorFrom(state.references) .getStatementParent(); diff --git a/packages/babel-plugin-transform-object-rest-spread/src/index.js b/packages/babel-plugin-transform-object-rest-spread/src/index.js index 2583ff1d13..c96358fed1 100644 --- a/packages/babel-plugin-transform-object-rest-spread/src/index.js +++ b/packages/babel-plugin-transform-object-rest-spread/src/index.js @@ -113,7 +113,6 @@ export default function({ types: t }) { const declar = t.variableDeclaration("let", [ t.variableDeclarator(paramPath.node, uid), ]); - declar._blockHoist = i ? numParams - i : 1; parentPath.ensureBlock(); parentPath.get("body").unshiftContainer("body", declar); diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-default-params/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-default-params/expected.js index a11f2f892a..6780bc3d89 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-default-params/expected.js +++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/dont-hoist-before-default-params/expected.js @@ -1,7 +1,6 @@ function render(Component) { - var text = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; - - var _ref = ; + var text = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '', + _ref = ; return function () { return _ref;