fixes stack overflow with circular dependencies

sokra · sokra · commit bc67522c741c · 2017-08-09T10:31:01.000+02:00
fixes webpack#5462
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -221,7 +221,12 @@ class ConcatenatedModule extends Module {
 	}
 
 	identifier() {
-		return this._orderedConcatenationList.map(info => info.module.identifier()).join(" ");
+		return this._orderedConcatenationList.map(info => {
+			switch(info.type) {
+				case "concatenated":
+					return info.module.identifier();
+			}
+		}).filter(Boolean).join(" ");
 	}
 
 	readableIdentifier(requestShortener) {
diff --git a/test/cases/scope-hoisting/circular-external/a1.js b/test/cases/scope-hoisting/circular-external/a1.js
@@ -0,0 +1,2 @@
+import "./a2";
+import "./b1";
diff --git a/test/cases/scope-hoisting/circular-external/a2.js b/test/cases/scope-hoisting/circular-external/a2.js
@@ -0,0 +1 @@
+export {}
diff --git a/test/cases/scope-hoisting/circular-external/b1.js b/test/cases/scope-hoisting/circular-external/b1.js
@@ -0,0 +1,2 @@
+import "./b2";
+import "./c1";
diff --git a/test/cases/scope-hoisting/circular-external/b2.js b/test/cases/scope-hoisting/circular-external/b2.js
@@ -0,0 +1 @@
+export {}
diff --git a/test/cases/scope-hoisting/circular-external/c1.js b/test/cases/scope-hoisting/circular-external/c1.js
@@ -0,0 +1,2 @@
+import "./c2";
+import "./a1";
diff --git a/test/cases/scope-hoisting/circular-external/c2.js b/test/cases/scope-hoisting/circular-external/c2.js
@@ -0,0 +1 @@
+export {}
diff --git a/test/cases/scope-hoisting/circular-external/index.js b/test/cases/scope-hoisting/circular-external/index.js
@@ -0,0 +1,7 @@
+it("should compile and run fine", function(done) {
+	Promise.all([
+		import("./a1"),
+		import("./b1"),
+		import("./c1")
+	]).then(function() { done(); });
+});
diff --git a/test/statsCases/scope-hoisting-multi/expected.txt b/test/statsCases/scope-hoisting-multi/expected.txt
@@ -1,4 +1,4 @@
-Hash: 731069e082cf620521ce0fb5d80076a98557894b
+Hash: 731069e082cf620521cea66588099dc6439215ab
 Child
     Hash: 731069e082cf620521ce
     Time: Xms
@@ -14,20 +14,20 @@ Child
        [9] (webpack)/test/statsCases/scope-hoisting-multi/second.js 177 bytes {4} [built]
       [10] (webpack)/test/statsCases/scope-hoisting-multi/lazy_second.js 55 bytes {1} [built]
 Child
-    Hash: 0fb5d80076a98557894b
+    Hash: a66588099dc6439215ab
     Time: Xms
        [0] (webpack)/test/statsCases/scope-hoisting-multi/common_lazy_shared.js 25 bytes {0} {1} {2} [built]
        [1] (webpack)/test/statsCases/scope-hoisting-multi/vendor.js 25 bytes {5} [built]
            ModuleConcatenation bailout: Module is an entry point
        [2] (webpack)/test/statsCases/scope-hoisting-multi/common.js + 1 modules 62 bytes {3} {4} [built]
        [3] (webpack)/test/statsCases/scope-hoisting-multi/common_lazy.js 25 bytes {1} {2} [built]
-       [4] (webpack)/test/statsCases/scope-hoisting-multi/first.js + 1 modules 248 bytes {3} [built]
+       [4] (webpack)/test/statsCases/scope-hoisting-multi/first.js + 1 modules 248 bytes {4} [built]
            ModuleConcatenation bailout: Module is an entry point
            ModuleConcatenation bailout: Cannot concat with (webpack)/test/statsCases/scope-hoisting-multi/common.js
            ModuleConcatenation bailout: Cannot concat with (webpack)/test/statsCases/scope-hoisting-multi/vendor.js (<- Module is an entry point)
        [5] (webpack)/test/statsCases/scope-hoisting-multi/lazy_shared.js 31 bytes {0} [built]
            ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: (webpack)/test/statsCases/scope-hoisting-multi/first.js (referenced with import()), (webpack)/test/statsCases/scope-hoisting-multi/second.js (referenced with import())
-       [6] (webpack)/test/statsCases/scope-hoisting-multi/second.js 177 bytes {4} [built]
+       [6] (webpack)/test/statsCases/scope-hoisting-multi/second.js 177 bytes {3} [built]
            ModuleConcatenation bailout: Module is an entry point
        [7] (webpack)/test/statsCases/scope-hoisting-multi/lazy_second.js 55 bytes {1} [built]
            ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: (webpack)/test/statsCases/scope-hoisting-multi/second.js (referenced with import())

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,12 @@ class ConcatenatedModule extends Module {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`identifier() {`
`224`		`- return this._orderedConcatenationList.map(info => info.module.identifier()).join(" ");`
	`224`	`+ return this._orderedConcatenationList.map(info => {`
	`225`	`+ switch(info.type) {`
	`226`	`+ case "concatenated":`
	`227`	`+ return info.module.identifier();`
	`228`	`+ }`
	`229`	`+ }).filter(Boolean).join(" ");`
`225`	`230`	`}`
`226`	`231`
`227`	`232`	`readableIdentifier(requestShortener) {`