Handle conditional breaks in do-while loops with unconditional return (…

…#3180)
rollup · Oct 20, 2019 · 24063a6 · 24063a6
1 parent 06fb16a
commit 24063a6
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 77 deletions.
diff --git a/src/ast/nodes/DoWhileStatement.ts b/src/ast/nodes/DoWhileStatement.ts
@@ -1,8 +1,4 @@
-import {
-	BROKEN_FLOW_BREAK_CONTINUE,
-	HasEffectsContext,
-	InclusionContext
-} from '../ExecutionContext';
+import { HasEffectsContext, InclusionContext } from '../ExecutionContext';
 import * as NodeType from './NodeType';
 import { ExpressionNode, IncludeChildren, StatementBase, StatementNode } from './shared/Node';
 
@@ -22,9 +18,7 @@ export default class DoWhileStatement extends StatementBase {
 		if (this.body.hasEffects(context)) return true;
 		context.ignore.breaks = breaks;
 		context.ignore.continues = continues;
-		if (context.brokenFlow === BROKEN_FLOW_BREAK_CONTINUE) {
-			context.brokenFlow = brokenFlow;
-		}
+		context.brokenFlow = brokenFlow;
 		return false;
 	}
 
@@ -33,8 +27,6 @@ export default class DoWhileStatement extends StatementBase {
 		this.test.include(context, includeChildrenRecursively);
 		const { brokenFlow } = context;
 		this.body.include(context, includeChildrenRecursively);
-		if (context.brokenFlow === BROKEN_FLOW_BREAK_CONTINUE) {
-			context.brokenFlow = brokenFlow;
-		}
+		context.brokenFlow = brokenFlow;
 	}
 }
diff --git a/test/form/samples/break-control-flow/break-statement-labels-do-while/_config.js b/test/form/samples/break-control-flow/break-statement-labels-do-while/_config.js
diff --git a/test/form/samples/break-control-flow/break-statement-labels-do-while/_expected.js b/test/form/samples/break-control-flow/break-statement-labels-do-while/_expected.js
diff --git a/test/form/samples/break-control-flow/break-statement-labels-do-while/main.js b/test/form/samples/break-control-flow/break-statement-labels-do-while/main.js
diff --git a/test/form/samples/break-control-flow/loop-errors/_expected.js b/test/form/samples/break-control-flow/loop-errors/_expected.js
@@ -17,8 +17,13 @@ try {
 function doWhileLoop() {
 	console.log(hoisted);
 	do {
+		if (globalThis.unknown) {
+			break;
+		}
 		throw new Error();
 	} while (globalThis.unknown);
+	console.log('retained');
+	throw new Error();
 	do {
 		var hoisted;
 	} while (globalThis.unknown);

diff --git a/test/form/samples/break-control-flow/loop-errors/main.js b/test/form/samples/break-control-flow/loop-errors/main.js
@@ -20,10 +20,14 @@ try {
 function doWhileLoop() {
 	console.log(hoisted);
 	do {
+		if (globalThis.unknown) {
+			break;
+		}
 		throw new Error();
 		console.log('removed');
 	} while (globalThis.unknown);
-	console.log('removed');
+	console.log('retained');
+	throw new Error();
 	do {
 		var hoisted;
 		console.log('removed');

diff --git a/test/function/samples/do-while-conditional-break/_config.js b/test/function/samples/do-while-conditional-break/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'handles conditional breaks in do-while loops with unconditional return'
+};
diff --git a/test/function/samples/do-while-conditional-break/main.js b/test/function/samples/do-while-conditional-break/main.js
@@ -0,0 +1,12 @@
+function test(condition) {
+	do {
+		if (condition) {
+			break;
+		}
+		return false;
+	} while (true);
+	return true;
+}
+
+assert.equal(test(false), false);
+assert.equal(test(true), true);