Merge pull request #30347 from ravikandhadai/oslog-crash-in-inout-aliasable

Author: swift-ci

lib/SILOptimizer/Mandatory/OSLogOptimization.cpp

@@ -606,9 +606,8 @@ SILInstruction *getInstructionFollowingValueDefinition(SILValue value) {
 /// \p value is a trivial type, return the value itself.
 SILValue makeOwnedCopyOfSILValue(SILValue value, SILFunction &fun) {
   SILType type = value->getType();
-  if (type.isTrivial(fun))
+  if (type.isTrivial(fun) || type.isAddress())
     return value;
-  assert(!type.isAddress() && "cannot make owned copy of addresses");
 
   SILInstruction *instAfterValueDefinition =
       getInstructionFollowingValueDefinition(value);

test/SILOptimizer/OSLogPrototypeCompileDiagnostics.swift

@@ -75,7 +75,7 @@ internal enum Color {
 
 if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
 
-  // No error is expected here.
+  // Invoking the log calls in unreachable code should not crash the compiler.
   func testUnreachableLogCall(h: Logger, c: Color)  {
     let arg = 10
     switch c {
@@ -93,6 +93,14 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
         """)
     }
   }
+
+  // Passing InOut values to the logger should not crash the compiler.
+  func foo(_ logger: Logger, _ mutableValue: inout String) {
+     logger.log("FMFLabelledLocation: initialized with coder \(mutableValue)")
+      // expected-error@-1 {{escaping closure captures 'inout' parameter 'mutableValue'}}
+      // expected-note@-3 {{parameter 'mutableValue' is declared 'inout'}}
+      // expected-note@-3 {{captured here}}
+  }
 }
 
 // This is an extension used only for testing a diagnostic that doesn't arise

test/SILOptimizer/OSLogPrototypeCompileTest.swift

@@ -600,3 +600,21 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
   }
 }
 
+protocol Proto {
+  var property: String { get set }
+}
+
+// Test capturing of address-only types in autoclosures.
+
+if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
+  // CHECK-LABEL: @${{.*}}testInterpolationOfExistentialsL_
+  func testInterpolationOfExistentials(h: Logger, p: Proto) {
+    h.debug("A protocol's property \(p.property)")
+  }
+
+  // CHECK-LABEL: @${{.*}}testInterpolationOfGenericsL_
+  func testInterpolationOfGenerics<T : Proto>(h: Logger, p: T) {
+    h.debug("A generic argument's property \(p.property)")
+  }
+}
+