Merge pull request #13650 from gottesmm/pr-f8a5f14f05eebc3cb838bd7e05b0cfc88a94025a

Author: swift-ci

test/sil-opt/Inputs/guaranteed-normal-args.swift

@@ -0,0 +1,8 @@
+
+open class Foo {
+  open func doSomething(_ f: Foo) {}
+}
+
+@_inlineable public func callFoo(f: Foo) {
+  f.doSomething(f)
+}

test/sil-opt/guaranteed-normal-args-negative.sil

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend %S/Inputs/guaranteed-normal-args.swift -o %t/TestModule.swiftmodule -emit-module -module-name TestModule
+// RUN: not --crash %target-sil-opt %s -I=%t -enable-guaranteed-normal-arguments
+
+// This is a negative test
+
+sil_stage canonical
+
+import TestModule
+
+sil @callFoo : $@convention(thin) (@owned Foo) -> () {
+bb0(%0 : $Foo):
+  %1 = class_method %0 : $Foo, #Foo.doSomething!1 : (Foo) -> (Foo) -> (), $@convention(method) (@guaranteed Foo, @owned Foo) -> ()
+  destroy_value %0 : $Foo
+  %9999 = tuple()
+  return %9999 : $()
+}

test/sil-opt/guaranteed-normal-args-positive.sil

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend %S/Inputs/guaranteed-normal-args.swift -o %t/TestModule.swiftmodule -emit-module -module-name TestModule -enable-guaranteed-normal-arguments
+// RUN: %target-sil-opt %s -I=%t -enable-guaranteed-normal-arguments
+
+// This is a positive test
+
+sil_stage canonical
+
+import TestModule
+
+sil @callFoo : $@convention(thin) (@owned Foo) -> () {
+bb0(%0 : $Foo):
+  %1 = class_method %0 : $Foo, #Foo.doSomething!1 : (Foo) -> (Foo) -> (), $@convention(method) (@guaranteed Foo, @guaranteed Foo) -> ()
+  destroy_value %0 : $Foo
+  %9999 = tuple()
+  return %9999 : $()
+}

tools/sil-opt/SILOpt.cpp

@@ -195,6 +195,11 @@ AssumeUnqualifiedOwnershipWhenParsing(
     "assume-parsing-unqualified-ownership-sil", llvm::cl::Hidden, llvm::cl::init(false),
     llvm::cl::desc("Assume all parsed functions have unqualified ownership"));
 
+static llvm::cl::opt<bool>
+EnableGuaranteedNormalArguments(
+    "enable-guaranteed-normal-arguments", llvm::cl::Hidden, llvm::cl::init(false),
+    llvm::cl::desc("Assume that the input module was compiled with -enable-guaranteed-normal-arguments enabled"));
+
 /// Regular expression corresponding to the value given in one of the
 /// -pass-remarks* command line flags. Passes whose name matches this regexp
 /// will emit a diagnostic.
@@ -315,6 +320,8 @@ int main(int argc, char **argv) {
   SILOpts.EnableSILOwnership = EnableSILOwnershipOpt;
   SILOpts.AssumeUnqualifiedOwnershipWhenParsing =
     AssumeUnqualifiedOwnershipWhenParsing;
+  SILOpts.EnableGuaranteedNormalArguments =
+    EnableGuaranteedNormalArguments;
 
   if (EnforceExclusivity.getNumOccurrences() != 0) {
     switch (EnforceExclusivity) {