Merge pull request #8440 from Connormiha/oprimize-chunk-can-be-integr…

…ated Cache hasRunstime in chunk
webpack · Nov 30, 2018 · 72a8a1f · 72a8a1f
2 parents e3e8a68 + 537d3e4
commit 72a8a1f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -454,6 +454,10 @@ class Chunk {
 	}
 
 	canBeIntegrated(otherChunk) {
+		if (this.preventIntegration || otherChunk.preventIntegration) {
+			return false;
+		}
+
 		const isAvailable = (a, b) => {
 			const queue = new Set(b.groupsIterable);
 			for (const chunkGroup of queue) {
@@ -466,14 +470,13 @@ class Chunk {
 			return true;
 		};
 
-		if (this.preventIntegration || otherChunk.preventIntegration) {
-			return false;
-		}
+		const selfHasRuntime = this.hasRuntime();
+		const otherChunkHasRuntime = otherChunk.hasRuntime();
 
-		if (this.hasRuntime() !== otherChunk.hasRuntime()) {
-			if (this.hasRuntime()) {
+		if (selfHasRuntime !== otherChunkHasRuntime) {
+			if (selfHasRuntime) {
 				return isAvailable(this, otherChunk);
-			} else if (otherChunk.hasRuntime()) {
+			} else if (otherChunkHasRuntime) {
 				return isAvailable(otherChunk, this);
 			} else {
 				return false;