Skip to content

Commit 0aa890f

Browse files
authored
---
yaml --- r: 340474 b: refs/heads/rxwei-patch-1 c: 90f6363 h: refs/heads/master
1 parent c8a4170 commit 0aa890f

22 files changed

+360
-233
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: 95c221a118d7ce8b8c57a9ceea2e37516bbdc26b
1018+
refs/heads/rxwei-patch-1: 90f636357eaa3f571135542a2a01459e7a035547
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/Mandatory/OSLogOptimization.cpp

Lines changed: 275 additions & 173 deletions
Large diffs are not rendered by default.

branches/rxwei-patch-1/stdlib/private/OSLog/OSLog.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ public struct Logger {
3838

3939
/// Log a string interpolation at a given level. The level is `default` if
4040
/// it is not specified.
41-
@inlinable
42-
@_semantics("oslog.log")
41+
@_transparent
4342
@_optimize(none)
4443
public func log(level: OSLogType = .default, _ message: OSLogMessage) {
4544
osLog(logObject, level, message)
@@ -103,8 +102,7 @@ internal func osLog(
103102
/// - message: An instance of `OSLogMessage` created from string interpolation
104103
/// - assertion: A closure that takes a format string and a pointer to a
105104
/// byte buffer and asserts a condition.
106-
@inlinable
107-
@_semantics("oslog.log.test_helper")
105+
@_transparent
108106
@_optimize(none)
109107
public // @testable
110108
func _checkFormatStringAndBuffer(

branches/rxwei-patch-1/stdlib/private/OSLog/OSLogMessage.swift

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,20 @@ public struct OSLogInterpolation : StringInterpolationProtocol {
175175
@_optimize(none)
176176
public init(literalCapacity: Int, interpolationCount: Int) {
177177
// Since the format string is fully constructed at compile time,
178-
// the parameters `literalCapacity` and `interpolationCount` are ignored.
178+
// the parameter `literalCapacity` is ignored.
179+
formatString = ""
180+
arguments = OSLogArguments(capacity: interpolationCount)
181+
preamble = 0
182+
argumentCount = 0
183+
totalBytesForSerializingArguments = 0
184+
}
185+
186+
/// An internal initializer that should be used only when there are no
187+
/// interpolated expressions. This function must be constant evaluable.
188+
@inlinable
189+
@_semantics("oslog.interpolation.init")
190+
@_optimize(none)
191+
internal init() {
179192
formatString = ""
180193
arguments = OSLogArguments()
181194
preamble = 0
@@ -253,6 +266,7 @@ public struct OSLogInterpolation : StringInterpolationProtocol {
253266
}
254267

255268
/// Return true if and only if the parameter is .private.
269+
/// This function must be constant evaluable.
256270
@inlinable
257271
@_semantics("oslog.interpolation.isPrivate")
258272
@_effects(readonly)
@@ -352,22 +366,24 @@ public struct OSLogMessage :
352366
{
353367
public let interpolation: OSLogInterpolation
354368

355-
/// Initializer for accepting string interpolations.
356-
@_transparent
369+
/// Initializer for accepting string interpolations. This function must be
370+
/// constant evaluable.
371+
@inlinable
357372
@_optimize(none)
373+
@_semantics("oslog.message.init_interpolation")
358374
public init(stringInterpolation: OSLogInterpolation) {
359375
self.interpolation = stringInterpolation
360376
}
361377

362-
/// Initializer for accepting string literals.
363-
@_transparent
378+
/// Initializer for accepting string literals. This function must be
379+
/// constant evaluable.
380+
@inlinable
364381
@_optimize(none)
382+
@_semantics("oslog.message.init_stringliteral")
365383
public init(stringLiteral value: String) {
366-
// Note that the actual value of `literalCapacity` is not important as it
367-
// is ignored by `OSLogInterpolation.init`.
368-
var s = OSLogInterpolation(literalCapacity: 1, interpolationCount: 0)
384+
var s = OSLogInterpolation()
369385
s.appendLiteral(value)
370-
self.init(stringInterpolation: s)
386+
self.interpolation = s
371387
}
372388

373389
/// The byte size of the buffer that will be passed to the C os_log ABI.
@@ -380,38 +396,50 @@ public struct OSLogMessage :
380396
}
381397
}
382398

399+
383400
/// A representation of a sequence of arguments and headers (of possibly
384401
/// different types) that have to be serialized to a byte buffer. The arguments
385402
/// are captured within closures and stored in an array. The closures accept an
386403
/// instance of `OSLogByteBufferBuilder`, and when invoked, serialize the
387404
/// argument using the passed `OSLogByteBufferBuilder` instance.
405+
@_fixed_layout
388406
@usableFromInline
389407
internal struct OSLogArguments {
390408
/// An array of closures that captures arguments of possibly different types.
391-
internal var argumentClosures: [(inout OSLogByteBufferBuilder) -> ()]
392-
393409
@usableFromInline
410+
internal var argumentClosures: [(inout OSLogByteBufferBuilder) -> ()]?
411+
412+
/// This function must be constant evaluable.
413+
@inlinable
414+
@_semantics("oslog.arguments.init_empty")
415+
@_optimize(none)
394416
internal init() {
417+
argumentClosures = nil
418+
}
419+
420+
@usableFromInline
421+
internal init(capacity: Int) {
395422
argumentClosures = []
423+
argumentClosures!.reserveCapacity(capacity)
396424
}
397425

398426
/// Append a byte-sized header, constructed by
399427
/// `OSLogMessage.appendInterpolation`, to the tracked array of closures.
400428
@usableFromInline
401429
internal mutating func append(_ header: UInt8) {
402-
argumentClosures.append({ $0.serialize(header) })
430+
argumentClosures!.append({ $0.serialize(header) })
403431
}
404432

405433
/// Append an (autoclosured) interpolated expression of type Int, passed to
406434
/// `OSLogMessage.appendInterpolation`, to the tracked array of closures.
407435
@usableFromInline
408436
internal mutating func append(_ value: @escaping () -> Int) {
409-
argumentClosures.append({ $0.serialize(value()) })
437+
argumentClosures!.append({ $0.serialize(value()) })
410438
}
411439

412440
@usableFromInline
413441
internal func serialize(into bufferBuilder: inout OSLogByteBufferBuilder) {
414-
argumentClosures.forEach { $0(&bufferBuilder) }
442+
argumentClosures?.forEach { $0(&bufferBuilder) }
415443
}
416444
}
417445

branches/rxwei-patch-1/test/SILOptimizer/OSLogPrototypeCompileDiagnostics.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import OSLogPrototype
1212
if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
1313

1414
func testDynamicLogMessage(h: Logger, message: OSLogMessage) {
15-
h.log(level: .debug, message) // expected-error {{os log methods must be passed a string interpolation literal. 'OSLogMessage' must not be constructed explicitly}}
15+
// FIXME: log APIs must always be passed a string interpolation literal.
16+
// Diagnose this.
17+
h.log(level: .debug, message)
1618
}
1719

1820
func testNonconstantFormatOption(h: Logger, formatOpt: IntFormat) {

branches/rxwei-patch-1/test/SILOptimizer/OSLogPrototypeCompileTest.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
2828
// Check integer constants passed to the withCString closure: buffersize,
2929
// premable and argument count.
3030

31-
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @inout_aliasable OSLogArguments) -> ()
31+
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @guaranteed OSLogArguments) -> ()
3232
// CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
3333
// CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
3434
// CHECK-64-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int64, 12
@@ -55,7 +55,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
5555
// Check integer constants passed to the withCString closure: buffersize,
5656
// premable and argument count.
5757

58-
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @inout_aliasable OSLogArguments) -> ()
58+
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @guaranteed OSLogArguments) -> ()
5959
// CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
6060
// CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
6161
// CHECK-64-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int64, 12
@@ -85,7 +85,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
8585
// Check integer constants passed to the withCString closure: buffersize,
8686
// premable and argument count.
8787

88-
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @inout_aliasable OSLogArguments) -> ()
88+
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @guaranteed OSLogArguments) -> ()
8989
// CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
9090
// CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
9191
// CHECK-64-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int64, 12
@@ -119,7 +119,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
119119
// Check integer constants passed to the withCString closure: buffersize,
120120
// premable and argument count.
121121

122-
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @inout_aliasable OSLogArguments) -> ()
122+
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @guaranteed OSLogArguments) -> ()
123123
// CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
124124
// CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
125125
// CHECK-64-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int64, 32
@@ -152,7 +152,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
152152
// Check other constants passed to the withCString closure: buffersize,
153153
// premable and argument count.
154154

155-
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @inout_aliasable OSLogArguments) -> ()
155+
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @guaranteed OSLogArguments) -> ()
156156
// CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
157157
// CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
158158
// CHECK-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int{{[0-9]+}}, 2
@@ -223,7 +223,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
223223
// Check integer constants passed to the withCString closure: buffersize,
224224
// premable and argument count.
225225

226-
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @inout_aliasable OSLogArguments) -> ()
226+
// CHECK-DAG: {{%.*}} = partial_apply [callee_guaranteed] [on_stack] [[OSLOGCLOSURE:%[0-9]+]]({{%.*}}, {{%.*}}, [[BUFFERSIZE:%[0-9]+]], [[PREAMBLE:%[0-9]+]], [[ARGCOUNT:%[0-9]+]], {{%.*}}) : $@convention(thin) (UnsafePointer<Int8>, @guaranteed OSLog, OSLogType, Int, UInt8, UInt8, @guaranteed OSLogArguments) -> ()
227227
// CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
228228
// CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
229229
// CHECK-64-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int64, 482

branches/rxwei-patch-1/test/lit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ config.target_resilience_test = (
13941394

13951395
# FIXME: Get symbol diffing working with binutils nm as well. The flags are slightly
13961396
# different.
1397-
if platform.system() != 'Darwin':
1397+
if platform.system() != 'Darwin' or swift_test_mode == 'optimize_none_with_implicit_dynamic':
13981398
config.target_resilience_test = ('%s --no-symbol-diff' %
13991399
config.target_resilience_test)
14001400

branches/rxwei-patch-1/utils/api_checker/sdk-module-lists/infer-imports.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def get_immediate_subdirectories(a_dir):
1515
if os.path.isdir(os.path.join(a_dir, name))]
1616

1717

18-
def get_frameworks(sdk_path):
18+
def get_frameworks(sdk_path, swift_frameworks_only):
1919
frameworks_path = sdk_path + "/System/Library/Frameworks"
2020
names = []
2121
for frame in os.listdir(frameworks_path):
@@ -32,6 +32,9 @@ def get_frameworks(sdk_path):
3232
if name not in blacklist:
3333
names.append(name)
3434
continue
35+
# We only care about Swift frameworks then we are done.
36+
if swift_frameworks_only:
37+
continue
3538

3639
if not os.path.exists(header_dir_path):
3740
if os.path.exists(module_dir_path):
@@ -95,7 +98,8 @@ def main():
9598
parser.add_option("-o", "--output", help="output mode",
9699
type=str, dest="out_mode", default="list")
97100
parser.add_option("--hash", action="store_true", dest="use_hash")
98-
101+
parser.add_option("--swift-frameworks-only", action="store_true")
102+
parser.add_option("--v", action="store_true")
99103
(opts, cmd) = parser.parse_args()
100104

101105
if not opts.sdk:
@@ -105,7 +109,10 @@ def main():
105109
parser.error(
106110
"output mode not specified: 'clang-import'/'swift-import'/'list'")
107111

108-
frames = get_frameworks(opts.sdk)
112+
frames = get_frameworks(opts.sdk, opts.swift_frameworks_only)
113+
if opts.v:
114+
for name in frames:
115+
print >>sys.stderr, 'Including: ', name
109116
if opts.out_mode == "clang-import":
110117
print_clang_imports(frames, opts.use_hash)
111118
elif opts.out_mode == "swift-import":

branches/rxwei-patch-1/utils/api_checker/swift-api-checker.py

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,16 @@ def get_sdk_path(platform):
4747
return check_output(['xcrun', '-sdk', platform, '-show-sdk-path'])
4848

4949

50-
def prepare_module_list(platform, file):
51-
check_call([INFER_IMPORT_PATH, '-s', get_sdk_path(platform)], output=file)
50+
def prepare_module_list(platform, file, verbose, swift_frameworks_only):
51+
cmd = [INFER_IMPORT_PATH, '-s', get_sdk_path(platform)]
52+
if swift_frameworks_only:
53+
cmd.extend(['--swift-frameworks-only'])
54+
if verbose:
55+
cmd.extend(['--v'])
56+
check_call(cmd, output=file)
57+
# The fixed modules are all objc frameworks.
58+
if swift_frameworks_only:
59+
return
5260
with open(INFER_IMPORT_DIR + '/fixed-modules-common.txt', 'r') as extra:
5361
file.write(extra.read())
5462
with open(INFER_IMPORT_DIR + '/fixed-modules-' + platform + '.txt',
@@ -78,7 +86,8 @@ def __init__(self, tool_path, platform):
7886
self.sdk + '/System/Library/Frameworks/',
7987
os.path.realpath(self.sdk + '/../../Library/Frameworks/')]
8088

81-
def run(self, output, module, swift_ver, opts, verbose):
89+
def run(self, output, module, swift_ver, opts, verbose,
90+
swift_frameworks_only):
8291
cmd = [self.tool_path, '-o', output, '-sdk', self.sdk, '-target',
8392
self.target, '-dump-sdk', '-module-cache-path',
8493
'/tmp/ModuleCache', '-swift-version',
@@ -93,7 +102,8 @@ def run(self, output, module, swift_ver, opts, verbose):
93102
check_call(cmd, verbose=verbose)
94103
else:
95104
with tempfile.NamedTemporaryFile() as tmp:
96-
prepare_module_list(self.platform, tmp)
105+
prepare_module_list(self.platform, tmp, verbose,
106+
swift_frameworks_only)
97107
cmd.extend(['-module-list-file', tmp.name])
98108
check_call(cmd, verbose=verbose)
99109

@@ -147,6 +157,10 @@ def main():
147157
name of the module/framework to generate baseline, e.g. Foundation
148158
''')
149159

160+
basic_group.add_argument('--swift-frameworks-only',
161+
action='store_true',
162+
help='Only include Swift frameworks in the dump')
163+
150164
basic_group.add_argument('--opts', nargs='+', default=[], help='''
151165
additional flags to pass to swift-api-digester
152166
''')
@@ -176,7 +190,8 @@ def main():
176190
runner = DumpConfig(tool_path=args.tool_path, platform=args.target)
177191
runner.run(output=args.output, module=args.module,
178192
swift_ver=args.swift_version, opts=args.opts,
179-
verbose=args.v)
193+
verbose=args.v,
194+
swift_frameworks_only=args.swift_frameworks_only)
180195
elif args.action == 'diagnose':
181196
if not args.dump_before:
182197
fatal_error("Need to specify --dump-before")

branches/rxwei-patch-1/validation-test/Evolution/test_bitwise_takable.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import bitwise_takable
86

branches/rxwei-patch-1/validation-test/Evolution/test_class_change_size.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import class_change_size
86

branches/rxwei-patch-1/validation-test/Evolution/test_class_insert_superclass.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import class_insert_superclass
86

branches/rxwei-patch-1/validation-test/Evolution/test_class_remove_property.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import class_remove_property
86

branches/rxwei-patch-1/validation-test/Evolution/test_enum_change_size.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import enum_change_size
86

branches/rxwei-patch-1/validation-test/Evolution/test_global_change_size.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import global_change_size
86

branches/rxwei-patch-1/validation-test/Evolution/test_struct_add_property.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import struct_add_property
86

branches/rxwei-patch-1/validation-test/Evolution/test_struct_change_size.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %target-resilience-test
22
// REQUIRES: executable_test
33

4-
// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
5-
64
import StdlibUnittest
75
import struct_change_size
86

0 commit comments

Comments
 (0)