[sil-combine] Eliminate a dead parameter.

gottesmm · gottesmm · commit d4214b79b1fd · 2020-12-20T13:46:46.000-08:00
We pass in deadEndBlocks into scCanonicalize's constructor now.
diff --git a/lib/SILOptimizer/SILCombiner/SILCombine.cpp b/lib/SILOptimizer/SILCombiner/SILCombine.cpp
@@ -138,7 +138,7 @@ class SILCombineCanonicalize final : CanonicalizeInstruction {
     changed = true;
   }
 
-  bool tryCanonicalize(SILInstruction *inst, DeadEndBlocks &deadEndBlocks) {
+  bool tryCanonicalize(SILInstruction *inst) {
     changed = false;
     canonicalize(inst);
     return changed;
@@ -178,7 +178,7 @@ bool SILCombiner::doOneIteration(SILFunction &F, unsigned Iteration) {
     }
 
     // Canonicalize the instruction.
-    if (scCanonicalize.tryCanonicalize(I, deadEndBlocks)) {
+    if (scCanonicalize.tryCanonicalize(I)) {
       MadeChange = true;
       continue;
     }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ class SILCombineCanonicalize final : CanonicalizeInstruction {`
`138`	`138`	`changed = true;`
`139`	`139`	`}`
`140`	`140`
`141`		`- bool tryCanonicalize(SILInstruction *inst, DeadEndBlocks &deadEndBlocks) {`
	`141`	`+ bool tryCanonicalize(SILInstruction *inst) {`
`142`	`142`	`changed = false;`
`143`	`143`	`canonicalize(inst);`
`144`	`144`	`return changed;`
`@@ -178,7 +178,7 @@ bool SILCombiner::doOneIteration(SILFunction &F, unsigned Iteration) {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// Canonicalize the instruction.`
`181`		`- if (scCanonicalize.tryCanonicalize(I, deadEndBlocks)) {`
	`181`	`+ if (scCanonicalize.tryCanonicalize(I)) {`
`182`	`182`	`MadeChange = true;`
`183`	`183`	`continue;`
`184`	`184`	`}`