Merge pull request #62434 from eeckstein/fix-mandatory-inliner

eeckstein · web-flow · commit 19742ba44629 · 2022-12-07T16:40:05.000+01:00
Fix a crash in the mandatory inliner related to optimization remarks
diff --git a/lib/SIL/Utils/OptimizationRemark.cpp b/lib/SIL/Utils/OptimizationRemark.cpp
@@ -136,7 +136,7 @@ static bool hasForceEmitSemanticAttr(SILFunction &fn, StringRef passName) {
 }
 
 static bool isMethodWithForceEmitSemanticAttrNominalType(SILFunction &fn) {
-  if (!fn.hasSelfParam())
+  if (!fn.hasSelfParam() || fn.getArguments().empty())
     return false;
 
   auto selfType = fn.getSelfArgument()->getType();
diff --git a/test/SILOptimizer/performance-annotations.swift b/test/SILOptimizer/performance-annotations.swift
@@ -223,3 +223,8 @@ func closueWhichModifiesLocalVar() -> Int {
   return x
 }
 
+@_noAllocation
+func createEmptyArray() {
+  _ = [Int]() // expected-error {{ending the lifetime of a value of type}}
+}
+

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ static bool hasForceEmitSemanticAttr(SILFunction &fn, StringRef passName) {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`static bool isMethodWithForceEmitSemanticAttrNominalType(SILFunction &fn) {`
`139`		`- if (!fn.hasSelfParam())`
	`139`	`+ if (!fn.hasSelfParam() \|\| fn.getArguments().empty())`
`140`	`140`	`return false;`
`141`	`141`
`142`	`142`	`auto selfType = fn.getSelfArgument()->getType();`
Original file line number	Diff line number	Diff line change
`@@ -223,3 +223,8 @@ func closueWhichModifiesLocalVar() -> Int {`
`223`	`223`	`return x`
`224`	`224`	`}`
`225`	`225`
	`226`	`+@_noAllocation`
	`227`	`+func createEmptyArray() {`
	`228`	`+ _ = [Int]() // expected-error {{ending the lifetime of a value of type}}`
	`229`	`+}`
	`230`	`+`