---

yaml
---
r: 341981
b: refs/heads/rxwei-patch-1
c: da61cc8
h: refs/heads/master
i:
  341979: 99bbbbc

Author: lorentey

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 06f82a53b5da26b67a8fd9414d8f8877eca8a3e1
+refs/heads/rxwei-patch-1: da61cc8cdf7aa2bfb3ab03200c52c4d371dc6751
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/README.md

@@ -76,7 +76,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
 
 #### macOS
 
-To build for macOS, you need [Xcode 11 beta](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 11 beta 4](https://developer.apple.com/xcode/downloads/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document or the host information on <https://ci.swift.org> for the
 current required version.

branches/rxwei-patch-1/lib/IRGen/MetadataRequest.cpp

@@ -642,11 +642,6 @@ static MetadataResponse emitNominalMetadataRef(IRGenFunction &IGF,
 bool irgen::isTypeMetadataAccessTrivial(IRGenModule &IGM, CanType type) {
   assert(!type->hasArchetype());
 
-  // Support dynamically replacing opaque result types. Don't cache the
-  // accessor result.
-  if (!IGM.getOptions().shouldOptimize() && type->hasOpaqueArchetype())
-    return true;
-
   // Value type metadata only requires dynamic initialization on first
   // access if it contains a resilient type.
   if (isa<StructType>(type) || isa<EnumType>(type)) {
@@ -1489,6 +1484,7 @@ void irgen::emitCacheAccessFunction(IRGenModule &IGM,
 
   // If the load yielded null, emit the type metadata.
   IGF.Builder.emitBlock(isNullBB);
+  
   MetadataResponse response = getValue(IGF, parameters);
 
   // Ensure that we have a dynamically-correct state value.

branches/rxwei-patch-1/test/Driver/static-stdlib.swift

@@ -161,10 +161,10 @@ public func useFoo(x: String, y: C) {
 }
 
 // CHECK-LABEL: define {{.*}} @"$s18opaque_result_type6useFoo1x1yySS_AA1CCtF"
-// CHECK: [[CONFORMANCE:%.*]] = call swiftcc i8** @swift_getOpaqueTypeConformance(i8* {{.*}}, %swift.type_descriptor* {{.*}}s18opaque_result_type3baz1zQrx_tAA1PRzAA1QRzlFQOMQ{{.*}}, [[WORD:i32|i64]] 2)
-// CHECK: [[MD:%.*]] = call swiftcc %swift.metadata_response @swift_getOpaqueTypeMetadata([[WORD]] 255, i8* {{.*}}, %swift.type_descriptor* {{.*}}s18opaque_result_type3baz1zQrx_tAA1PRzAA1QRzlFQOMQ{{.*}})
+// CHECK: [[CONFORMANCE:%.*]] = call swiftcc i8** @swift_getOpaqueTypeConformance(i8* {{.*}}, %swift.type_descriptor* {{.*}}s18opaque_result_type3baz1zQrx_tAA1PRzAA1QRzlFQOMQ{{.*}}, [[WORD:i32|i64]] 1)
+// CHECK: [[MD:%.*]] = call swiftcc %swift.metadata_response @"$s18opaque_result_type3baz1zQrx_tAA1PRzAA1QRzlFQOyAA1CCQo_Ma"
 // CHECK: [[TYPE:%.*]] = extractvalue %swift.metadata_response [[MD]], 0
-// CHECK: call swiftcc %swift.metadata_response @swift_getAssociatedTypeWitness([[WORD]] 0, i8** [[CONFORMANCE]], %swift.type* [[TYPE]]
+// CHECK: call swiftcc i8** @swift_getAssociatedConformanceWitness(i8** [[CONFORMANCE]], %swift.type* [[TYPE]]
 
 // CHECK-LABEL: define {{.*}} @"$sSS18opaque_result_type1PAA1AAaBP_AA1OPWT"
 // CHECK: call swiftcc i8** @swift_getOpaqueTypeConformance(i8* {{.*}}, %swift.type_descriptor* {{.*}}sSS18opaque_result_typeE3pooQryFQOMQ{{.*}}, [[WORD]] 1)

branches/rxwei-patch-1/test/IRGen/opaque_result_type.swift

@@ -1,4 +1,4 @@
-// RUN: %sourcekitd-test -req=track-compiles == -req=complete %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1
+// RUN: %sourcekitd-test -req=track-compiles == -req=complete %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
 // COMPILE_1: {
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
 // COMPILE_1:  key.filepath: "{{.*}}SOURCE_DIR{{.*}}code-completion.swift",

branches/rxwei-patch-1/test/Interpreter/Inputs/dynamic_replacement_opaque1.swift

@@ -1,4 +1,4 @@
-// RUN: %sourcekitd-test -req=track-compiles == -req=cursor %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1
+// RUN: %sourcekitd-test -req=track-compiles == -req=cursor %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
 // COMPILE_1: {
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
 // COMPILE_1:  key.filepath: "SOURCE_DIR{{.*}}cursor-info.swift",

branches/rxwei-patch-1/test/Interpreter/Inputs/dynamic_replacement_opaque2.swift

@@ -6,15 +6,15 @@
 // NONE-NOT: compile-did-finish
 
 
-// RUN: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s | %FileCheck %s -check-prefix=COMPILE_1
-// RUN: %sourcekitd-test -req=track-compiles == -req=track-compiles == -req=sema %s -- %s | %FileCheck %s -check-prefix=COMPILE_1
+// RUN: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
+// RUN: %sourcekitd-test -req=track-compiles == -req=track-compiles == -req=sema %s -- %s | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
 // RUN: %sourcekitd-test -req=track-compiles \
 // RUN:     == -req=sema %s -- %s \
 // RUN:     == -req=track-compiles -req-opts=value=0 \
-// RUN:     == -req=edit %s -replace="//" | %FileCheck %s -check-prefix=COMPILE_1
+// RUN:     == -req=edit %s -replace="//" | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
 // RUN: %sourcekitd-test -req=sema %s -- %s \
 // RUN:     == -req=track-compiles -req-opts=value=1 \
-// RUN:     == -req=edit %s -replace="//" | %FileCheck %s -check-prefix=COMPILE_1
+// RUN:     == -req=edit %s -replace="//" | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
 // COMPILE_1: {
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
 // COMPILE_1:  key.filepath: "SOURCE_DIR{{.*}}enable-disable.swift",

branches/rxwei-patch-1/test/Interpreter/dynamic_replacement_opaque_result.swift

@@ -1,7 +1,7 @@
-// RUN: %sourcekitd-test -req=track-compiles == -req=typecontextinfo %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1
+// RUN: %sourcekitd-test -req=track-compiles == -req=typecontextinfo %s -offset=0 -- %s | %FileCheck %s -check-prefix=COMPILE_1 --enable-yaml-compatibility
 // COMPILE_1: {
 // COMPILE_1:  key.notification: source.notification.compile-will-start,
-// COMPILE_1:  key.filepath: "SOURCE_DIR{{.*}}type-context-info.swift",
+// COMPILE_1:  key.filepath: "{{.*}}SOURCE_DIR{{.*}}type-context-info.swift",
 // COMPILE_1:  key.compileid: [[CID1:".*"]]
 // COMPILE_1: }
 // COMPILE_1: {

branches/rxwei-patch-1/test/SourceKit/CompileNotifications/code-completion.swift

@@ -116,13 +116,13 @@ def get_simulator_command(run_os, run_cpu, sdk_path):
                 print("INFO: Xcode -> Preferences -> Components -> Simulators")
                 sys.exit(1)
             else:
-                return "simctl spawn 'iPhone 5'"
+                return "simctl spawn --standalone 'iPhone 5'"
         else:
-            return "simctl spawn 'iPhone Xs'"
+            return "simctl spawn --standalone 'iPhone Xs'"
     elif run_os == 'tvos':
-        return "simctl spawn 'Apple TV 4K'"
+        return "simctl spawn --standalone 'Apple TV 4K'"
     elif run_os == 'watchos':
-        return "simctl spawn 'Apple Watch Series 3 - 38mm'"
+        return "simctl spawn --standalone 'Apple Watch Series 3 - 38mm'"
     else:
         lit_config.fatal("Unknown simulator OS %r" % run_os)