Merge pull request #12272 from DougGregor/inout-param-clone

Author: swift-ci

lib/AST/Decl.cpp

@@ -4202,7 +4202,9 @@ ParamDecl::ParamDecl(Specifier specifier,
 ParamDecl::ParamDecl(ParamDecl *PD, bool withTypes)
   : VarDecl(DeclKind::Param, /*IsStatic*/false, PD->getSpecifier(),
             /*IsCaptureList*/false, PD->getNameLoc(), PD->getName(),
-            PD->hasType() && withTypes? PD->getType() : Type(),
+            PD->hasType() && withTypes
+              ? PD->getType()->getInOutObjectType()
+              : Type(),
             PD->getDeclContext()),
     ArgumentName(PD->getArgumentName()),
     ArgumentNameLoc(PD->getArgumentNameLoc()),
@@ -4215,7 +4217,7 @@ ParamDecl::ParamDecl(ParamDecl *PD, bool withTypes)
     typeLoc.setType(Type());
 
   if (withTypes && PD->hasInterfaceType())
-    setInterfaceType(PD->getInterfaceType());
+    setInterfaceType(PD->getInterfaceType()->getInOutObjectType());
 }
 
 

test/decl/inherit/initializer.swift

@@ -150,3 +150,34 @@ func testClassInGenericFunc<T>(t: T) {
 
   _ = B(t: t)
 }
+
+// rdar://problem/34789779
+public class Node {
+  var data : Data
+
+  public struct Data {
+    var index: Int32 = 0// for helpers
+  }
+
+ init(data: inout Data/*, context: Context*/) {
+   self.data = data
+ }
+
+ public required init(node: Node) {
+   data = node.data
+ }
+}
+
+final class SubNode : Node {
+  var a: Int
+
+  required init(node: Node) {
+    a = 1
+    super.init(node: node)
+  }
+
+  init(data: inout Data, additionalParam: Int) {
+    a = additionalParam
+    super.init(data: &data)
+  }
+}

validation-test/compiler_crashers_2/0127-sr5546.swift

@@ -0,0 +1,36 @@
+// RUN: not --crash %target-swift-frontend %s -typecheck
+public struct Foo<A, B, C> {}
+
+public protocol P {
+    associatedtype PA
+    associatedtype PB = Never
+    associatedtype PC = Never
+
+    typealias Context = Foo<PA, PB, PC>
+
+    func f1(_ x: Context, _ y: PA)
+    func f2(_ x: Context, _ y: PB)
+    func f3(_ x: Context, _ y: PC)
+    func f4(_ x: Context)
+}
+
+public extension P {
+    public func f1(_ x: Context, _ y: PA) {
+    }
+    public func f2(_ x: Context, _ y: PB) {
+    }
+    public func f3(_ x: Context, _ y: PC) {
+    }
+    public func f4(_ x: Context) {
+    }
+}
+
+public struct S: P {
+    public typealias PA = String
+    public typealias PB = Int
+
+    public func f1(_ x: Context, _ y: PA) {
+    }
+    public func f2(_ x: Context, _ y: PB) {
+    }
+}

validation-test/compiler_crashers_2_fixed/0126-sr5905.swift

@@ -0,0 +1,28 @@
+// RUN: not %target-swift-frontend %s -typecheck
+protocol VectorIndex {
+    associatedtype Vector8 : Vector where Vector8.Index == Self, Vector8.Element == UInt8
+}
+enum VectorIndex1 : VectorIndex {
+    case i0
+    typealias Vector8 = Vector1<UInt8>
+}
+protocol Vector {
+    associatedtype Index: VectorIndex
+    associatedtype Element
+    init(elementForIndex: (Index) -> Element)
+    subscript(index: Index) -> Element { get set }
+}
+struct Vector1<Element> : Vector {
+    //typealias Index = VectorIndex1 // Uncomment this line to workaround bug.
+    var e0: Element
+    init(elementForIndex: (VectorIndex1) -> Element) {
+        e0 = elementForIndex(.i0)
+    }
+    subscript(index: Index) -> Element {
+        get { return e0 }
+        set { e0 = newValue }
+    }
+}
+extension Vector where Index == VectorIndex1 {
+    init(_ e0: Element) { fatalError() }
+}