Skip to content

Commit da5911d

Browse files
Merge pull request #5465 from swiftwasm/release/5.8
[pull] swiftwasm-release/5.8 from release/5.8
2 parents 2226975 + 85f8090 commit da5911d

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

utils/build-presets.ini

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,11 @@ sourcekit-lsp=0
11871187
[preset: buildbot_incremental_linux,lsan,tools=RDA,stdlib=RDA,test=no]
11881188
build-subdir=buildbot_incremental_lsan
11891189

1190+
# Reduce the size of the final toolchain, limit debug info
1191+
extra-cmake-options=
1192+
-DCMAKE_C_FLAGS="-gline-tables-only"
1193+
-DCMAKE_CXX_FLAGS="-gline-tables-only"
1194+
11901195
release-debuginfo
11911196
assertions
11921197
enable-lsan
@@ -1197,6 +1202,11 @@ reconfigure
11971202
[preset: buildbot_incremental_linux,lsan,tools=RDA,stdlib=DA,test=no]
11981203
build-subdir=buildbot_incremental_lsan
11991204

1205+
# Reduce the size of the final toolchain, limit debug info
1206+
extra-cmake-options=
1207+
-DCMAKE_C_FLAGS="-gline-tables-only"
1208+
-DCMAKE_CXX_FLAGS="-gline-tables-only"
1209+
12001210
llvm-cmake-options=-DLLVM_PARALLEL_LINK_JOBS=12
12011211
swift-cmake-options=-DSWIFT_PARALLEL_LINK_JOBS=12
12021212

utils/round-trip-syntax-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class RoundTripTask(object):
7474
logging.error(self.stderr.decode('utf-8', errors='replace'))
7575
raise RuntimeError()
7676

77-
contents = ''.join(map(lambda l: l.decode('utf-8', errors='replace'),
77+
contents = ''.join(map(lambda _: _.decode('utf-8', errors='replace'),
7878
open(self.input_filename, 'rb').readlines()))
7979
stdout_contents = self.stdout.decode('utf-8', errors='replace')
8080

validation-test/BuildSystem/skip_clean_llbuild.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
# RUN: mkdir -p %t
99
# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --llbuild --skip-clean-llbuild --cmake %cmake 2>&1 | %FileCheck --check-prefix=SKIP-CLEAN-LLBUILD-CHECK %s
1010

11-
# CLEAN-LLBUILD-CHECK: Cleaning the llbuild build directory
12-
# CLEAN-LLBUILD-CHECK-NEXT: rm -rf
11+
# CLEAN-LLBUILD-CHECK-DAG: Cleaning the llbuild build directory
12+
# CLEAN-LLBUILD-CHECK: rm -rf
1313

1414
# SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the llbuild build directory
1515
# SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/llbuild-[^/]*}}

validation-test/Sanitizers/tsan-ignores-arc-locks.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
// Check that TSan ignores the retain count update locks in the runtime.
99

10+
// REQUIRES: rdar108188149
11+
1012
import Foundation
1113

1214
public class Dummy {

0 commit comments

Comments
 (0)