---

yaml
---
r: 340702
b: refs/heads/rxwei-patch-1
c: 63c229b
h: refs/heads/master

Author: compnerd

[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: e15671327617382ca144c81d125a2ddd76e6d82b
+refs/heads/rxwei-patch-1: 63c229b4a8bb5a09d69989dfa25b6a8f6d303f19
 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/lib/SILOptimizer/Utils/CastOptimizer.cpp

@@ -1572,7 +1572,7 @@ static bool optimizeStaticallyKnownProtocolConformance(
     if (!Conformance)
       return false;
 
-    SILBuilder B(Inst);
+    SILBuilderWithScope B(Inst);
     SmallVector<ProtocolConformanceRef, 1> NewConformances;
     NewConformances.push_back(Conformance.getValue());
     ArrayRef<ProtocolConformanceRef> Conformances =

branches/rxwei-patch-1/stdlib/CMakeLists.txt

@@ -51,7 +51,7 @@ else()
   # everything and there are various places where we link runtime code with
   # code built by the host compiler. Disable sanitizers for the runtime for
   # now.
-  append("-fno-sanitize=all" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+  add_compile_options(-fno-sanitize=all)
 endif()
 
 # Do not enforce checks for LLVM's ABI-breaking build settings.
@@ -60,7 +60,11 @@ endif()
 # on the presence of symbols in libSupport to identify how the code was
 # built and cause link failures for mismatches. Without linking that library,
 # we get link failures regardless, so instead, this just disables the checks.
-append("-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  append("-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+else()
+  add_compile_definitions(LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
+endif()
 
 set(SWIFT_STDLIB_LIBRARY_BUILD_TYPES)
 if(SWIFT_BUILD_DYNAMIC_STDLIB)

branches/rxwei-patch-1/stdlib/public/Platform/CMakeLists.txt

@@ -95,7 +95,7 @@ foreach(sdk ${SWIFT_SDKS})
       set(GLIBC_ARCH_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_ARCH_INCLUDE_PATH}")
     endif()
 
-    if(${sdk} STREQUAL ANDROID)
+    if(sdk STREQUAL ANDROID)
       set(glibc_modulemap_source "bionic.modulemap.gyb")
     else()
       set(glibc_modulemap_source "glibc.modulemap.gyb")

branches/rxwei-patch-1/test/SILOptimizer/castoptimizer-wrongscope.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -emit-sil -o /dev/null \
+// RUN:   %s -Xllvm -sil-print-debuginfo -Onone -sil-verify-all \
+// RUN:   -Xllvm -sil-print-after=diagnostic-constant-propagation \
+// RUN:   2>&1 | %FileCheck %s
+
+// CHECK: alloc_stack $R, loc {{.*}}, scope 2
+// CHECK-NEXT: init_existential_addr {{.*}} : $*R, $Float, loc {{.*}}, scope 2
+// CHECK-NEXT: copy_addr [take] %8 to [initialization] %66 : $*Float, loc {{.*}}, scope 2
+
+protocol R {}
+extension Float: R {}
+print(1.0 as Float? as! R)

branches/rxwei-patch-1/test/Sanitizers/tsan-norace-deinit-run-time.swift

@@ -4,9 +4,6 @@
 // REQUIRES: executable_test
 // REQUIRES: tsan_runtime
 
-// Failing sporadically in CI
-// REQUIRES: rdar51804988
-
 // FIXME: This should be covered by "tsan_runtime"; older versions of Apple OSs
 // don't support TSan.
 // UNSUPPORTED: remote_run