---

yaml
---
r: 340470
b: refs/heads/rxwei-patch-1
c: 729ad65
h: refs/heads/master

Author: slavapestov

[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: d3785d97bb1f6726a21b751310be433e72135338
+refs/heads/rxwei-patch-1: 729ad65aa12c60a184efeeb37a3ac6fd3c4bd2e3
 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/include/swift/AST/Decl.h

@@ -370,7 +370,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     IsStatic : 1
   );
 
-  SWIFT_INLINE_BITFIELD(VarDecl, AbstractStorageDecl, 4+1+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(VarDecl, AbstractStorageDecl, 4+1+1+1+1,
     /// The specifier associated with this variable or parameter.  This
     /// determines the storage semantics of the value e.g. mutability.
     Specifier : 4,
@@ -387,9 +387,6 @@ class alignas(1 << DeclAlignInBits) Decl {
     /// It is up to the debugger to instruct SIL how to access this variable.
     IsDebuggerVar : 1,
 
-    /// Whether this is a property defined in the debugger's REPL.
-    /// FIXME: Remove this once LLDB has proper support for resilience.
-    IsREPLVar : 1,
 
     /// Whether this is the backing storage for a property wrapper.
     IsPropertyWrapperBackingProperty : 1
@@ -4806,7 +4803,6 @@ class VarDecl : public AbstractStorageDecl {
     Bits.VarDecl.Specifier = static_cast<unsigned>(Sp);
     Bits.VarDecl.IsCaptureList = IsCaptureList;
     Bits.VarDecl.IsDebuggerVar = false;
-    Bits.VarDecl.IsREPLVar = false;
     Bits.VarDecl.HasNonPatternBindingInit = false;
     Bits.VarDecl.IsPropertyWrapperBackingProperty = false;
   }
@@ -5095,12 +5091,6 @@ class VarDecl : public AbstractStorageDecl {
   void setDebuggerVar(bool IsDebuggerVar) {
     Bits.VarDecl.IsDebuggerVar = IsDebuggerVar;
   }
-  
-  /// Is this a special debugger REPL variable?
-  /// FIXME: Remove this once LLDB has proper support for resilience.
-  bool isREPLVar() const { return Bits.VarDecl.IsREPLVar; }
-  void setREPLVar(bool IsREPLVar) {
-    Bits.VarDecl.IsREPLVar = IsREPLVar;
   }
 
   /// Retrieve the custom attribute that attaches a property wrapper to this

branches/rxwei-patch-1/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp

@@ -38,7 +38,8 @@ public struct Logger {
 
   /// Log a string interpolation at a given level. The level is `default` if
   /// it is not specified.
-  @_transparent
+  @inlinable
+  @_semantics("oslog.log")
   @_optimize(none)
   public func log(level: OSLogType = .default, _ message: OSLogMessage) {
     osLog(logObject, level, message)
@@ -102,7 +103,8 @@ internal func osLog(
 ///   - message: An instance of `OSLogMessage` created from string interpolation
 ///   - assertion: A closure that takes a format string and a pointer to a
 ///     byte buffer and asserts a condition.
-@_transparent
+@inlinable
+@_semantics("oslog.log.test_helper")
 @_optimize(none)
 public // @testable
 func _checkFormatStringAndBuffer(

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

@@ -175,20 +175,7 @@ public struct OSLogInterpolation : StringInterpolationProtocol {
   @_optimize(none)
   public init(literalCapacity: Int, interpolationCount: Int) {
     // Since the format string is fully constructed at compile time,
-    // the parameter `literalCapacity` is ignored.
-    formatString = ""
-    arguments = OSLogArguments(capacity: interpolationCount)
-    preamble = 0
-    argumentCount = 0
-    totalBytesForSerializingArguments = 0
-  }
-
-  /// An internal initializer that should be used only when there are no
-  /// interpolated expressions. This function must be constant evaluable.
-  @inlinable
-  @_semantics("oslog.interpolation.init")
-  @_optimize(none)
-  internal init() {
+    // the parameters `literalCapacity` and `interpolationCount` are ignored.
     formatString = ""
     arguments = OSLogArguments()
     preamble = 0
@@ -266,7 +253,6 @@ public struct OSLogInterpolation : StringInterpolationProtocol {
   }
 
   /// Return true if and only if the parameter is .private.
-  /// This function must be constant evaluable.
   @inlinable
   @_semantics("oslog.interpolation.isPrivate")
   @_effects(readonly)
@@ -366,24 +352,22 @@ public struct OSLogMessage :
 {
   public let interpolation: OSLogInterpolation
 
-  /// Initializer for accepting string interpolations. This function must be
-  /// constant evaluable.
-  @inlinable
+  /// Initializer for accepting string interpolations.
+  @_transparent
   @_optimize(none)
-  @_semantics("oslog.message.init_interpolation")
   public init(stringInterpolation: OSLogInterpolation) {
     self.interpolation = stringInterpolation
   }
 
-  /// Initializer for accepting string literals. This function must be
-  /// constant evaluable.
-  @inlinable
+  /// Initializer for accepting string literals.
+  @_transparent
   @_optimize(none)
-  @_semantics("oslog.message.init_stringliteral")
   public init(stringLiteral value: String) {
-    var s = OSLogInterpolation()
+    // Note that the actual value of `literalCapacity` is not important as it
+    // is ignored by `OSLogInterpolation.init`.
+    var s = OSLogInterpolation(literalCapacity: 1, interpolationCount: 0)
     s.appendLiteral(value)
-    self.interpolation = s
+    self.init(stringInterpolation: s)
   }
 
   /// The byte size of the buffer that will be passed to the C os_log ABI.
@@ -396,50 +380,38 @@ public struct OSLogMessage :
   }
 }
 
-
 /// A representation of a sequence of arguments and headers (of possibly
 /// different types) that have to be serialized to a byte buffer. The arguments
 /// are captured within closures and stored in an array. The closures accept an
 /// instance of `OSLogByteBufferBuilder`, and when invoked, serialize the
 /// argument using the passed `OSLogByteBufferBuilder` instance.
-@_fixed_layout
 @usableFromInline
 internal struct OSLogArguments {
   /// An array of closures that captures arguments of possibly different types.
-  @usableFromInline
-  internal var argumentClosures: [(inout OSLogByteBufferBuilder) -> ()]?
-
-  /// This function must be constant evaluable.
-  @inlinable
-  @_semantics("oslog.arguments.init_empty")
-  @_optimize(none)
-  internal init() {
-    argumentClosures = nil
-  }
+  internal var argumentClosures: [(inout OSLogByteBufferBuilder) -> ()]
 
   @usableFromInline
-  internal init(capacity: Int) {
+  internal init() {
     argumentClosures = []
-    argumentClosures!.reserveCapacity(capacity)
   }
 
   /// Append a byte-sized header, constructed by
   /// `OSLogMessage.appendInterpolation`, to the tracked array of closures.
   @usableFromInline
   internal mutating func append(_ header: UInt8) {
-    argumentClosures!.append({ $0.serialize(header) })
+    argumentClosures.append({ $0.serialize(header) })
   }
 
   /// Append an (autoclosured) interpolated expression of type Int, passed to
   /// `OSLogMessage.appendInterpolation`, to the tracked array of closures.
   @usableFromInline
   internal mutating func append(_ value: @escaping () -> Int) {
-    argumentClosures!.append({ $0.serialize(value()) })
+    argumentClosures.append({ $0.serialize(value()) })
   }
 
   @usableFromInline
   internal func serialize(into bufferBuilder: inout OSLogByteBufferBuilder) {
-    argumentClosures?.forEach { $0(&bufferBuilder) }
+    argumentClosures.forEach { $0(&bufferBuilder) }
   }
 }
 

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

@@ -12,9 +12,7 @@ import OSLogPrototype
 if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
 
   func testDynamicLogMessage(h: Logger, message: OSLogMessage) {
-    // FIXME: log APIs must always be passed a string interpolation literal.
-    // Diagnose this.
-    h.log(level: .debug, message)
+    h.log(level: .debug, message) // expected-error {{os log methods must be passed a string interpolation literal. 'OSLogMessage' must not be constructed explicitly}}
   }
 
   func testNonconstantFormatOption(h: Logger, formatOpt: IntFormat) {

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

@@ -28,7 +28,7 @@ if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
     // Check integer constants passed to the withCString closure: buffersize,
     // premable and argument count.
 
-    // 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) -> ()
+    // 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) -> ()
     // CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
     // CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
     // 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, *) {
     // Check integer constants passed to the withCString closure: buffersize,
     // premable and argument count.
 
-    // 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) -> ()
+    // 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) -> ()
     // CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
     // CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
     // 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, *) {
     // Check integer constants passed to the withCString closure: buffersize,
     // premable and argument count.
 
-    // 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) -> ()
+    // 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) -> ()
     // CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
     // CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
     // 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, *) {
     // Check integer constants passed to the withCString closure: buffersize,
     // premable and argument count.
 
-    // 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) -> ()
+    // 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) -> ()
     // CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
     // CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
     // 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, *) {
     // Check other constants passed to the withCString closure: buffersize,
     // premable and argument count.
 
-    // 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) -> ()
+    // 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) -> ()
     // CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
     // CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
     // 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, *) {
     // Check integer constants passed to the withCString closure: buffersize,
     // premable and argument count.
 
-    // 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) -> ()
+    // 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) -> ()
     // CHECK-DAG: [[OSLOGCLOSURE]] = function_ref @$s14OSLogPrototype5osLogyySo03OS_C4_logC_So0c1_F7_type_taAA0A7MessageVtFySPys4Int8VGXEfU_
     // CHECK-DAG: [[BUFFERSIZE]] = struct $Int ([[BUFFERSIZELIT:%[0-9]+]]
     // CHECK-64-DAG: [[BUFFERSIZELIT]] = integer_literal $Builtin.Int64, 482

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

@@ -1394,7 +1394,7 @@ config.target_resilience_test = (
 
 # FIXME: Get symbol diffing working with binutils nm as well. The flags are slightly
 # different.
-if platform.system() != 'Darwin' or swift_test_mode == 'optimize_none_with_implicit_dynamic':
+if platform.system() != 'Darwin':
     config.target_resilience_test = ('%s --no-symbol-diff' %
                                      config.target_resilience_test)
 

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

@@ -15,7 +15,7 @@ def get_immediate_subdirectories(a_dir):
             if os.path.isdir(os.path.join(a_dir, name))]
 
 
-def get_frameworks(sdk_path, swift_frameworks_only):
+def get_frameworks(sdk_path):
     frameworks_path = sdk_path + "/System/Library/Frameworks"
     names = []
     for frame in os.listdir(frameworks_path):
@@ -32,9 +32,6 @@ def get_frameworks(sdk_path, swift_frameworks_only):
                 if name not in blacklist:
                     names.append(name)
                 continue
-            # We only care about Swift frameworks then we are done.
-            if swift_frameworks_only:
-                continue
 
             if not os.path.exists(header_dir_path):
                 if os.path.exists(module_dir_path):
@@ -98,8 +95,7 @@ def main():
     parser.add_option("-o", "--output", help="output mode",
                       type=str, dest="out_mode", default="list")
     parser.add_option("--hash", action="store_true", dest="use_hash")
-    parser.add_option("--swift-frameworks-only", action="store_true")
-    parser.add_option("--v", action="store_true")
+
     (opts, cmd) = parser.parse_args()
 
     if not opts.sdk:
@@ -109,10 +105,7 @@ def main():
         parser.error(
             "output mode not specified: 'clang-import'/'swift-import'/'list'")
 
-    frames = get_frameworks(opts.sdk, opts.swift_frameworks_only)
-    if opts.v:
-        for name in frames:
-            print >>sys.stderr, 'Including: ', name
+    frames = get_frameworks(opts.sdk)
     if opts.out_mode == "clang-import":
         print_clang_imports(frames, opts.use_hash)
     elif opts.out_mode == "swift-import":

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

@@ -47,16 +47,8 @@ def get_sdk_path(platform):
     return check_output(['xcrun', '-sdk', platform, '-show-sdk-path'])
 
 
-def prepare_module_list(platform, file, verbose, swift_frameworks_only):
-    cmd = [INFER_IMPORT_PATH, '-s', get_sdk_path(platform)]
-    if swift_frameworks_only:
-        cmd.extend(['--swift-frameworks-only'])
-    if verbose:
-        cmd.extend(['--v'])
-    check_call(cmd, output=file)
-    # The fixed modules are all objc frameworks.
-    if swift_frameworks_only:
-        return
+def prepare_module_list(platform, file):
+    check_call([INFER_IMPORT_PATH, '-s', get_sdk_path(platform)], output=file)
     with open(INFER_IMPORT_DIR + '/fixed-modules-common.txt', 'r') as extra:
         file.write(extra.read())
     with open(INFER_IMPORT_DIR + '/fixed-modules-' + platform + '.txt',
@@ -86,8 +78,7 @@ def __init__(self, tool_path, platform):
             self.sdk + '/System/Library/Frameworks/',
             os.path.realpath(self.sdk + '/../../Library/Frameworks/')]
 
-    def run(self, output, module, swift_ver, opts, verbose,
-            swift_frameworks_only):
+    def run(self, output, module, swift_ver, opts, verbose):
         cmd = [self.tool_path, '-o', output, '-sdk', self.sdk, '-target',
                self.target, '-dump-sdk', '-module-cache-path',
                '/tmp/ModuleCache', '-swift-version',
@@ -102,8 +93,7 @@ def run(self, output, module, swift_ver, opts, verbose,
             check_call(cmd, verbose=verbose)
         else:
             with tempfile.NamedTemporaryFile() as tmp:
-                prepare_module_list(self.platform, tmp, verbose,
-                                    swift_frameworks_only)
+                prepare_module_list(self.platform, tmp)
                 cmd.extend(['-module-list-file', tmp.name])
                 check_call(cmd, verbose=verbose)
 
@@ -157,10 +147,6 @@ def main():
         name of the module/framework to generate baseline, e.g. Foundation
         ''')
 
-    basic_group.add_argument('--swift-frameworks-only',
-                             action='store_true',
-                             help='Only include Swift frameworks in the dump')
-
     basic_group.add_argument('--opts', nargs='+', default=[], help='''
         additional flags to pass to swift-api-digester
         ''')
@@ -190,8 +176,7 @@ def main():
         runner = DumpConfig(tool_path=args.tool_path, platform=args.target)
         runner.run(output=args.output, module=args.module,
                    swift_ver=args.swift_version, opts=args.opts,
-                   verbose=args.v,
-                   swift_frameworks_only=args.swift_frameworks_only)
+                   verbose=args.v)
     elif args.action == 'diagnose':
         if not args.dump_before:
             fatal_error("Need to specify --dump-before")

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

@@ -1,6 +1,8 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import bitwise_takable
 

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

@@ -1,6 +1,8 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_change_size
 

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

@@ -1,6 +1,8 @@
 // RUN: %target-resilience-test
 // REQUIRES: executable_test
 
+// UNSUPPORTED: swift_test_mode_optimize_none_with_implicit_dynamic
+
 import StdlibUnittest
 import class_insert_superclass