Minify return statements used to implement breaks inside tails

rpetrich · Oct 26, 2019 · 1f941b2 · 1f941b2
1 parent ff5a531
commit 1f941b2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/async-to-promises.ts b/async-to-promises.ts
@@ -1550,9 +1550,16 @@ export default function({
 					blocks = [declaration].concat(blocks);
 					temporary = temporaryIdentifier;
 				}
-				blocks = removeUnnecessaryReturnStatements(
-					[types.ifStatement(exitCheck, returnStatement(temporary)) as Statement].concat(blocks)
-				);
+				if (temporary !== undefined) {
+					blocks = removeUnnecessaryReturnStatements(
+						[types.ifStatement(exitCheck, returnStatement(temporary)) as Statement].concat(blocks)
+					);
+				} else {
+					const minify = readConfigKey(generatorState.state.opts, "minify");
+					blocks = removeUnnecessaryReturnStatements(
+						[types.ifStatement(logicalNot(exitCheck, minify), blocks.length === 1 ? blocks[0] : blockStatement(blocks)) as Statement]
+					);
+				}
 			}
 			// Build a function expression for it
 			const fn = functionize(generatorState.state, temporary ? [temporary] : [], blockStatement(blocks), target);

diff --git a/tests/break with multiple labeled statements/hoisted.js b/tests/break with multiple labeled statements/hoisted.js
diff --git a/tests/break with multiple labeled statements/inlined.js b/tests/break with multiple labeled statements/inlined.js
diff --git a/tests/break with multiple labeled statements/output.js b/tests/break with multiple labeled statements/output.js
diff --git a/tests/while with inner break/hoisted.js b/tests/while with inner break/hoisted.js
diff --git a/tests/while with inner break/inlined.js b/tests/while with inner break/inlined.js
diff --git a/tests/while with inner break/output.js b/tests/while with inner break/output.js