Merge pull request #6810 from hughbe/wait-inline

CodaFi · web-flow · commit d7c3939330f2 · 2017-01-14T13:19:10.000-07:00
Use LLVM_ATTRIBUTE_NOINLINE instead of __attribute__((noinline))
diff --git a/lib/IRGen/AllocStackHoisting.cpp b/lib/IRGen/AllocStackHoisting.cpp
@@ -111,7 +111,7 @@ insertDeallocStackAtEndOf(SmallVectorImpl<SILInstruction *> &FunctionExits,
 }
 
 /// Hack to workaround a clang LTO bug.
-__attribute__((noinline))
+LLVM_ATTRIBUTE_NOINLINE
 void moveAllocStackToBeginningOfBlock(AllocStackInst* AS, SILBasicBlock *BB) {
   AS->removeFromParent();
   BB->push_front(AS);

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ insertDeallocStackAtEndOf(SmallVectorImpl<SILInstruction *> &FunctionExits,`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`/// Hack to workaround a clang LTO bug.`
`114`		`-__attribute__((noinline))`
	`114`	`+LLVM_ATTRIBUTE_NOINLINE`
`115`	`115`	`void moveAllocStackToBeginningOfBlock(AllocStackInst* AS, SILBasicBlock *BB) {`
`116`	`116`	`AS->removeFromParent();`
`117`	`117`	`BB->push_front(AS);`