[SILInliner] Also pass a SILBuilderContext.

Davide Italiano · Davide Italiano · commit 0f1837c1fc9c · 2019-06-13T14:30:24.000-07:00
Pointed out by Michael Gottesman.
diff --git a/lib/SILOptimizer/Utils/SILInliner.cpp b/lib/SILOptimizer/Utils/SILInliner.cpp
@@ -560,7 +560,7 @@ SILValue SILInlineCloner::borrowFunctionArgument(SILValue callArg,
     return callArg;
   }
 
-  SILBuilderWithScope beginBuilder(AI.getInstruction());
+  SILBuilderWithScope beginBuilder(AI.getInstruction(), getBuilder());
   auto *borrow = beginBuilder.createBeginBorrow(AI.getLoc(), callArg);
   if (auto *tryAI = dyn_cast<TryApplyInst>(AI)) {
     SILBuilderWithScope returnBuilder(tryAI->getNormalBB()->begin());

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ SILValue SILInlineCloner::borrowFunctionArgument(SILValue callArg,`
`560`	`560`	`return callArg;`
`561`	`561`	`}`
`562`	`562`
`563`		`- SILBuilderWithScope beginBuilder(AI.getInstruction());`
	`563`	`+ SILBuilderWithScope beginBuilder(AI.getInstruction(), getBuilder());`
`564`	`564`	`auto *borrow = beginBuilder.createBeginBorrow(AI.getLoc(), callArg);`
`565`	`565`	`if (auto *tryAI = dyn_cast<TryApplyInst>(AI)) {`
`566`	`566`	`SILBuilderWithScope returnBuilder(tryAI->getNormalBB()->begin());`