Merge pull request #5191 from jrose-apple/ArrayRef-assignment

swift-ci · web-flow · commit 9aa505a8e683 · 2016-10-07T23:07:06.000-07:00
diff --git a/lib/SILOptimizer/IPO/EagerSpecializer.cpp b/lib/SILOptimizer/IPO/EagerSpecializer.cpp
@@ -122,7 +122,7 @@ static void addReturnValueImpl(SILBasicBlock *RetBB, SILBasicBlock *NewRetBB,
   Builder.setInsertionPoint(NewRetBB);
   ArrayRef<SILValue> BBArgs;
   if (!NewRetVal->getType().isVoid())
-    BBArgs = {NewRetVal};
+    BBArgs = NewRetVal;
   Builder.createBranch(Loc, MergedBB, BBArgs);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ static void addReturnValueImpl(SILBasicBlock RetBB, SILBasicBlock NewRetBB,`
`122`	`122`	`Builder.setInsertionPoint(NewRetBB);`
`123`	`123`	`ArrayRef<SILValue> BBArgs;`
`124`	`124`	`if (!NewRetVal->getType().isVoid())`
`125`		`- BBArgs = {NewRetVal};`
	`125`	`+ BBArgs = NewRetVal;`
`126`	`126`	`Builder.createBranch(Loc, MergedBB, BBArgs);`
`127`	`127`	`}`
`128`	`128`