---

yaml
---
r: 343477
b: refs/heads/master-rebranch
c: 01c4717
h: refs/heads/master
i:
  343475: 271744f

Author: jckarter

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 0ae86c9c9d68e6eb8520fb4f1b54e9d04e25f772
+refs/heads/master-rebranch: 01c471757371200428746339f77000bc65c1a0f9
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/lib/AST/ASTMangler.cpp

@@ -736,7 +736,9 @@ void ASTMangler::appendOpaqueDeclName(const OpaqueTypeDecl *opaqueDecl) {
   if (canSymbolicReference(opaqueDecl)) {
     appendSymbolicReference(opaqueDecl);
   } else if (auto namingDecl = opaqueDecl->getNamingDecl()) {
+    CanGenericSignature savedSignature = CurGenericSignature;
     appendEntity(namingDecl);
+    CurGenericSignature = savedSignature;
     appendOperator("QO");
   } else {
     llvm_unreachable("todo: independent opaque type decls");

branches/master-rebranch/stdlib/public/SwiftShims/CMakeLists.txt

@@ -123,6 +123,25 @@ add_custom_command_target(unused_var
     COMMENT "Symlinking Clang resource headers into ${SWIFTLIB_DIR}/clang")
 add_dependencies(copy_shim_headers symlink_clang_headers)
 
+if(NOT SWIFT_BUILT_STANDALONE)
+  if(TARGET clang-resource-headers) # LLVM > 8
+    set(clang_resource_headers clang-resource-headers)
+  elseif(TARGET clang-headers) # LLVM <= 8
+    set(clang_resource_headers clang-headers)
+  else()
+    message(SEND_ERROR
+      "Unable to determine clang resource headers target in unified build")
+  endif()
+
+  foreach(target
+      symlink_clang_headers
+      clang-builtin-headers
+      clang-resource-dir-symlink
+      clang-builtin-headers-in-clang-resource-dir)
+    add_dependencies(${target} ${clang_resource_headers})
+  endforeach()
+endif()
+
 swift_install_in_component(FILES ${sources}
                            DESTINATION "lib/swift/shims"
                            COMPONENT stdlib)

branches/master-rebranch/test/IRGen/Inputs/mangle-opaque-return-types-A.swift

@@ -0,0 +1,73 @@
+public protocol Proto {
+  associatedtype Assoc : Proto
+  var value: Assoc { get }
+}
+
+extension Never : Proto {}
+
+extension Never {
+    public typealias Assoc = Never
+
+    public var value: Never {
+        switch self {}
+    }
+}
+protocol PrimitiveProto : Proto {}
+
+extension PrimitiveProto {
+    public var value: Never { valueError() }
+}
+
+extension Proto {
+    func valueError() -> Never {
+        fatalError("value() should not be called on \(Self.self).")
+    }
+}
+
+public struct EmptyProto : PrimitiveProto {
+  public init() {}
+}
+
+struct M<Content: Proto> : Proto {
+  var t: Content
+
+  init(_ t: Content) {
+    self.t = t
+  }
+
+  var value: some Proto {
+    return t.value
+  }
+}
+
+public struct Group<T> {
+  var t: T
+
+  public init(_ t: T) {
+    self.t = t
+  }
+}
+
+extension Group : Proto, PrimitiveProto where T : Proto {
+  public typealias Assoc = Never
+}
+
+public struct Choice<T, V>{
+  var v: V
+
+  public init(_ t: T, _ v: V) {
+    self.v = v
+  }
+}
+
+extension Choice : Proto where T: Proto, V: Proto {
+  public var value: some Proto {
+    return v.value
+  }
+}
+
+extension Proto {
+  public func add() -> some Proto  {
+    return M(self)
+  }
+}

branches/master-rebranch/test/IRGen/mangle-opaque-return-type.swift

@@ -0,0 +1,19 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -disable-availability-checking -emit-module -enable-library-evolution -emit-module-path=%t/A.swiftmodule -module-name=A %S/Inputs/mangle-opaque-return-types-A.swift
+// RUN: %target-swift-frontend -disable-availability-checking -I %t -emit-ir  %s
+import A
+
+public struct C<T, Content: Proto> {
+  let data: T
+  let content: Content
+
+  init(_ t: T, _ c: Content) {
+    data = t
+    content = c
+  }
+
+  public var dontCrash : some Proto {
+    return Group(Choice(content, EmptyProto().add()))
+  }
+}
+

branches/master-rebranch/tools/SourceKit/lib/SwiftLang/CMakeLists.txt

@@ -49,3 +49,5 @@ add_sourcekit_library(SourceKitSwiftLang
       objcarcopts
       profiledata
 )
+
+add_dependencies(SourceKitSwiftLang clang-tablegen-targets)

branches/master-rebranch/validation-test/Reflection/inherits_NSObject.swift

@@ -7,10 +7,6 @@
 // REQUIRES: objc_interop
 // REQUIRES: executable_test
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos
-// NOTE: Test is temporarily disabled for watchOS until we can figure out why
-// it's failing there. rdar://problem/50898688
-
 import Foundation
 import simd
 

branches/master-rebranch/validation-test/Reflection/inherits_ObjCClasses.swift

@@ -9,9 +9,6 @@
 
 // REQUIRES: objc_interop
 // REQUIRES: executable_test
-// REQUIRES: OS=macosx || OS=ios || OS=tvos
-// NOTE: Test is temporarily disabled for watchOS until we can figure out why
-// it's failing there. rdar://problem/50898688
 
 import simd
 import ObjCClasses