Merge pull request #40516 from nate-chandler/alloc_stack_hoisting/make-new-dealloc_stacks-locs-cleanups

nate-chandler · web-flow · commit 103cc32ca32b · 2021-12-11T13:03:29.000-08:00
[AllocStackHoisting] New dealloc_stack's locs are cleanups.
diff --git a/lib/IRGen/AllocStackHoisting.cpp b/lib/IRGen/AllocStackHoisting.cpp
@@ -118,7 +118,8 @@ insertDeallocStackAtEndOf(SmallVectorImpl<SILInstruction *> &FunctionExits,
   // Insert dealloc_stack in the exit blocks.
   for (auto *Exit : FunctionExits) {
     SILBuilderWithScope Builder(Exit);
-    Builder.createDeallocStack(AllocStack->getLoc(), AllocStack);
+    Builder.createDeallocStack(CleanupLocation(AllocStack->getLoc()),
+                               AllocStack);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ insertDeallocStackAtEndOf(SmallVectorImpl<SILInstruction *> &FunctionExits,`
`118`	`118`	`// Insert dealloc_stack in the exit blocks.`
`119`	`119`	`for (auto *Exit : FunctionExits) {`
`120`	`120`	`SILBuilderWithScope Builder(Exit);`
`121`		`- Builder.createDeallocStack(AllocStack->getLoc(), AllocStack);`
	`121`	`+ Builder.createDeallocStack(CleanupLocation(AllocStack->getLoc()),`
	`122`	`+ AllocStack);`
`122`	`123`	`}`
`123`	`124`	`}`
`124`	`125`