Merge pull request #18290 from mhong/master_const_fold_no_multi_value_inst

eeckstein · web-flow · commit df7c76f7da49 · 2018-08-02T15:27:12.000-07:00
Fixed a bug in const folding, where an inst that's not of type SingleValueInstruction gets added to the worklist
diff --git a/lib/SILOptimizer/Utils/ConstantFolding.cpp b/lib/SILOptimizer/Utils/ConstantFolding.cpp
@@ -1668,7 +1668,8 @@ ConstantFolder::processWorkList() {
 
       // The new constant could be further folded now, add it to the worklist.
       if (auto *Inst = C->getDefiningInstruction())
-        WorkList.insert(Inst);
+        if (isa<SingleValueInstruction>(Inst))
+          WorkList.insert(Inst);
     }
 
     // Eagerly DCE. We do this after visiting all users to ensure we don't

Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,8 @@ ConstantFolder::processWorkList() {`
`1668`	`1668`
`1669`	`1669`	`// The new constant could be further folded now, add it to the worklist.`
`1670`	`1670`	`if (auto *Inst = C->getDefiningInstruction())`
`1671`		`- WorkList.insert(Inst);`
	`1671`	`+ if (isa<SingleValueInstruction>(Inst))`
	`1672`	`+ WorkList.insert(Inst);`
`1672`	`1673`	`}`
`1673`	`1674`
`1674`	`1675`	`// Eagerly DCE. We do this after visiting all users to ensure we don't`