Prevent infinite deoptimizations (#3280)

rollup · Dec 12, 2019 · 9f77b73 · 9f77b73
1 parent a562ec5
commit 9f77b73
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 86 deletions.
diff --git a/src/ast/nodes/ConditionalExpression.ts b/src/ast/nodes/ConditionalExpression.ts
@@ -45,10 +45,12 @@ export default class ConditionalExpression extends NodeBase implements Deoptimiz
 		if (this.usedBranch !== null) {
 			const unusedBranch = this.usedBranch === this.consequent ? this.alternate : this.consequent;
 			this.usedBranch = null;
+			const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
+			this.expressionsToBeDeoptimized = [];
 			if (this.wasPathDeoptimizedWhileOptimized) {
 				unusedBranch.deoptimizePath(UNKNOWN_PATH);
 			}
-			for (const expression of this.expressionsToBeDeoptimized) {
+			for (const expression of expressionsToBeDeoptimized) {
 				expression.deoptimizeCache();
 			}
 		}

diff --git a/src/ast/nodes/LogicalExpression.ts b/src/ast/nodes/LogicalExpression.ts
@@ -48,10 +48,12 @@ export default class LogicalExpression extends NodeBase implements Deoptimizable
 	deoptimizeCache() {
 		if (this.usedBranch !== null) {
 			this.usedBranch = null;
+			const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
+			this.expressionsToBeDeoptimized = [];
 			if (this.wasPathDeoptimizedWhileOptimized) {
 				this.unusedBranch!.deoptimizePath(UNKNOWN_PATH);
 			}
-			for (const expression of this.expressionsToBeDeoptimized) {
+			for (const expression of expressionsToBeDeoptimized) {
 				expression.deoptimizeCache();
 			}
 		}

diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts
@@ -115,11 +115,13 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE
 	}
 
 	deoptimizeCache() {
+		const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
+		this.expressionsToBeDeoptimized = [];
 		this.propertyKey = UnknownKey;
 		if (this.wasPathDeoptimizedWhileOptimized) {
 			this.object.deoptimizePath(UNKNOWN_PATH);
 		}
-		for (const expression of this.expressionsToBeDeoptimized) {
+		for (const expression of expressionsToBeDeoptimized) {
 			expression.deoptimizeCache();
 		}
 	}

diff --git a/src/ast/variables/LocalVariable.ts b/src/ast/variables/LocalVariable.ts
@@ -70,7 +70,9 @@ export default class LocalVariable extends Variable {
 		if (path.length === 0) {
 			if (!this.isReassigned) {
 				this.isReassigned = true;
-				for (const expression of this.expressionsToBeDeoptimized) {
+				const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
+				this.expressionsToBeDeoptimized = [];
+				for (const expression of expressionsToBeDeoptimized) {
 					expression.deoptimizeCache();
 				}
 				if (this.init) {

diff --git a/...les/recursive-assignments/_expected/es.js → ...amples/recursive-assignments/_expected.js b/...les/recursive-assignments/_expected/es.js → ...amples/recursive-assignments/_expected.js
diff --git a/test/form/samples/recursive-assignments/_expected/amd.js b/test/form/samples/recursive-assignments/_expected/amd.js
diff --git a/test/form/samples/recursive-assignments/_expected/cjs.js b/test/form/samples/recursive-assignments/_expected/cjs.js
diff --git a/test/form/samples/recursive-assignments/_expected/iife.js b/test/form/samples/recursive-assignments/_expected/iife.js
diff --git a/test/form/samples/recursive-assignments/_expected/system.js b/test/form/samples/recursive-assignments/_expected/system.js
diff --git a/test/form/samples/recursive-assignments/_expected/umd.js b/test/form/samples/recursive-assignments/_expected/umd.js
diff --git a/test/form/samples/self-deoptimization/_config.js b/test/form/samples/self-deoptimization/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'handles situations where a member expression is deoptimized while being deoptimized'
+};
diff --git a/test/form/samples/self-deoptimization/_expected.js b/test/form/samples/self-deoptimization/_expected.js
@@ -0,0 +1,10 @@
+function foo(a) {
+	var b = bar({}, a);
+	b && b.delete();
+}
+
+function bar(a, b) {
+	return (b = 1) ? a.a[b] || null : null;
+}
+
+foo({});
diff --git a/test/form/samples/self-deoptimization/main.js b/test/form/samples/self-deoptimization/main.js
@@ -0,0 +1,10 @@
+function foo(a) {
+	var b = bar({}, a);
+	b && b.delete();
+}
+
+function bar(a, b) {
+	return (b = 1) ? a.a[b] || null : null;
+}
+
+foo({});