Skip to content

Commit 9a682d7

Browse files
authored
---
yaml --- r: 340703 b: refs/heads/rxwei-patch-1 c: 3b5e872 h: refs/heads/master i: 340701: 4be3a6e 340699: cbafaa8 340695: e93df17 340687: f2aae6c 340671: 7cc55ac
1 parent c408579 commit 9a682d7

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: 63c229b4a8bb5a09d69989dfa25b6a8f6d303f19
1018+
refs/heads/rxwei-patch-1: 3b5e87283f507c6fb7a373809e93af18bd59c417
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/SILOptimizer/Utils/CastOptimizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ static bool optimizeStaticallyKnownProtocolConformance(
15721572
if (!Conformance)
15731573
return false;
15741574

1575-
SILBuilderWithScope B(Inst);
1575+
SILBuilder B(Inst);
15761576
SmallVector<ProtocolConformanceRef, 1> NewConformances;
15771577
NewConformances.push_back(Conformance.getValue());
15781578
ArrayRef<ProtocolConformanceRef> Conformances =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ foreach(sdk ${SWIFT_SDKS})
9595
set(GLIBC_ARCH_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_ARCH_INCLUDE_PATH}")
9696
endif()
9797

98-
if(sdk STREQUAL ANDROID)
98+
if(${sdk} STREQUAL ANDROID)
9999
set(glibc_modulemap_source "bionic.modulemap.gyb")
100100
else()
101101
set(glibc_modulemap_source "glibc.modulemap.gyb")

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// REQUIRES: executable_test
55
// REQUIRES: tsan_runtime
66

7+
// Failing sporadically in CI
8+
// REQUIRES: rdar51804988
9+
710
// FIXME: This should be covered by "tsan_runtime"; older versions of Apple OSs
811
// don't support TSan.
912
// UNSUPPORTED: remote_run

0 commit comments

Comments
 (0)