fix: conditional/logical expression should request a new tree-shaking (#5481)

liuly0322 · web-flow · commit 190893a1bf0f · 2024-04-21T20:15:56.000+02:00
* fix: conditional/logical expression should request a new tree-shaking

* perf: rarely expressionsToBeDeoptimized.length &gt; 0, so move it outside
diff --git a/src/ast/nodes/ConditionalExpression.ts b/src/ast/nodes/ConditionalExpression.ts
@@ -46,12 +46,22 @@ export default class ConditionalExpression extends NodeBase implements Deoptimiz
 	}
 
 	deoptimizeCache(): void {
-		this.isBranchResolutionAnalysed = false;
+		if (
+			this.usedBranch ||
+			this.isBranchResolutionAnalysed ||
+			this.expressionsToBeDeoptimized.length > 0
+		) {
+			// Request another pass because we need to ensure "include" runs again if it is rendered
+			this.scope.context.requestTreeshakingPass();
+		}
 		const { expressionsToBeDeoptimized } = this;
-		this.expressionsToBeDeoptimized = [];
-		for (const expression of expressionsToBeDeoptimized) {
-			expression.deoptimizeCache();
+		if (expressionsToBeDeoptimized.length > 0) {
+			this.expressionsToBeDeoptimized = [];
+			for (const expression of expressionsToBeDeoptimized) {
+				expression.deoptimizeCache();
+			}
 		}
+		this.isBranchResolutionAnalysed = false;
 		if (this.usedBranch !== null) {
 			const unusedBranch = this.usedBranch === this.consequent ? this.alternate : this.consequent;
 			this.usedBranch = null;
diff --git a/src/ast/nodes/LogicalExpression.ts b/src/ast/nodes/LogicalExpression.ts
@@ -57,20 +57,22 @@ export default class LogicalExpression extends NodeBase implements Deoptimizable
 	}
 
 	deoptimizeCache(): void {
-		this.isBranchResolutionAnalysed = false;
-		if (this.expressionsToBeDeoptimized.length > 0) {
-			const {
-				scope: { context },
-				expressionsToBeDeoptimized
-			} = this;
+		if (
+			this.usedBranch ||
+			this.isBranchResolutionAnalysed ||
+			this.expressionsToBeDeoptimized.length > 0
+		) {
+			// Request another pass because we need to ensure "include" runs again if it is rendered
+			this.scope.context.requestTreeshakingPass();
+		}
+		const { expressionsToBeDeoptimized } = this;
+		if (expressionsToBeDeoptimized.length > 0) {
 			this.expressionsToBeDeoptimized = [];
 			for (const expression of expressionsToBeDeoptimized) {
 				expression.deoptimizeCache();
 			}
-			// Request another pass because we need to ensure "include" runs again if
-			// it is rendered
-			context.requestTreeshakingPass();
 		}
+		this.isBranchResolutionAnalysed = false;
 		if (this.usedBranch) {
 			const unusedBranch = this.usedBranch === this.left ? this.right : this.left;
 			this.usedBranch = null;
diff --git a/test/form/samples/request-tree-shaking-before-render/_config.js b/test/form/samples/request-tree-shaking-before-render/_config.js
@@ -0,0 +1,3 @@
+module.exports = defineTest({
+	description: 'a new tree-shaking is required so render will not fail'
+});
diff --git a/test/form/samples/request-tree-shaking-before-render/_expected.js b/test/form/samples/request-tree-shaking-before-render/_expected.js
@@ -0,0 +1,16 @@
+function s(t) {
+    t(x);
+}
+
+function f(b) {
+    return x.concat((b ? 1 : 0))
+}
+
+function w(b) {
+    f(b);
+}
+
+w(1);
+s(() => {
+  return w(0)
+});
diff --git a/test/form/samples/request-tree-shaking-before-render/main.js b/test/form/samples/request-tree-shaking-before-render/main.js
@@ -0,0 +1,16 @@
+function s(t) {
+    t(x)
+}
+
+function f(b) {
+    return x.concat((b ? 1 : 0))
+}
+
+function w(b) {
+    f(b)
+}
+
+w(1)
+s(() => {
+  return w(0)
+})

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = defineTest({`
	`2`	`+ description: 'a new tree-shaking is required so render will not fail'`
	`3`	`+});`