Properly include try-catch-statements even if they have already been (#…

…2898) included via another means
rollup · Jun 5, 2019 · 71f2fa8 · 71f2fa8
1 parent 6f9c3b5
commit 71f2fa8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/src/ast/nodes/TryStatement.ts b/src/ast/nodes/TryStatement.ts
@@ -10,6 +10,8 @@ export default class TryStatement extends StatementBase {
 	handler!: CatchClause | null;
 	type!: NodeType.tTryStatement;
 
+	private directlyIncluded = false;
+
 	hasEffects(options: ExecutionPathOptions): boolean {
 		return (
 			this.block.body.length > 0 ||
@@ -19,8 +21,9 @@ export default class TryStatement extends StatementBase {
 	}
 
 	include(includeChildrenRecursively: IncludeChildren) {
-		if (!this.included) {
+		if (!this.directlyIncluded) {
 			this.included = true;
+			this.directlyIncluded = true;
 			this.block.include(
 				this.context.tryCatchDeoptimization ? INCLUDE_VARIABLES : includeChildrenRecursively
 			);

diff --git a/test/form/samples/try-statement-deoptimization/include-via-outside-variable/_config.js b/test/form/samples/try-statement-deoptimization/include-via-outside-variable/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'works when the try-statement is included via an outside variable'
+};
diff --git a/test/form/samples/try-statement-deoptimization/include-via-outside-variable/_expected.js b/test/form/samples/try-statement-deoptimization/include-via-outside-variable/_expected.js
@@ -0,0 +1,6 @@
+console.log(myVar);
+
+try {
+	var myVar = 3;
+	console.log(myVar);
+} catch {}
diff --git a/test/form/samples/try-statement-deoptimization/include-via-outside-variable/main.js b/test/form/samples/try-statement-deoptimization/include-via-outside-variable/main.js
@@ -0,0 +1,6 @@
+console.log(myVar);
+
+try {
+	var myVar = 3;
+	console.log(myVar);
+} catch {}