---

yaml
---
r: 345807
b: refs/heads/master
c: 65d3249
h: refs/heads/master
i:
  345805: 0e7c336
  345803: 1f3496a
  345799: 00487c5
  345791: 864bfb9

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e9fb52c5ab04bd8cd73734befc62cbb5bc7a5d76
+refs/heads/master: 65d32495c2355f9acb2851a539613e689b07d4f9
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/.flake8

@@ -1,5 +1,5 @@
 [flake8]
-ignore = W291
+ignore = W291 W504
 filename = *.py,
            ./utils/80+-check,
            ./utils/backtrace-check,

trunk/benchmark/scripts/Benchmark_RuntimeLeaksRunner.in

@@ -151,9 +151,9 @@ def parse_args():
 
 if __name__ == "__main__":
     args = parse_args()
-    l = LeaksRunnerBenchmarkDriver(
+    driver = LeaksRunnerBenchmarkDriver(
         SWIFT_BIN_DIR, XFAIL_LIST, args.num_samples, args.num_iters)
-    if l.run(args.filter):
+    if driver.run(args.filter):
         sys.exit(0)
     else:
         sys.exit(-1)

trunk/benchmark/scripts/test_compare_perf_tests.py

@@ -591,7 +591,7 @@ def test_results_from_merge(self):
     def test_results_from_merge_verbose(self):
         """Parsing verbose log  merges all PerformanceTestSamples.
         ...this should technically be on TestPerformanceTestResult, but it's
-        easier to write here. ¯\_(ツ)_/¯"""
+        easier to write here. ¯\\_(ツ)_/¯"""
         concatenated_logs = """
     Sample 0,355883
     Sample 1,358817

trunk/tools/SourceKit/tools/swift-lang/CMakeLists.txt

@@ -13,7 +13,7 @@ if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB)
     UIDs.swift.gyb
 
     DEPENDS ${DEPENDS_LIST}
-    SWIFT_MODULE_DEPENDS_OSX Darwin
+    SWIFT_MODULE_DEPENDS_OSX Darwin Foundation
     PRIVATE_LINK_LIBRARIES ${SOURCEKITD_LINK_LIBS}
     SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
     INSTALL_IN_COMPONENT ${INSTALLED_COMP}

trunk/tools/SourceKit/tools/swift-lang/SourceKitdResponse.swift

@@ -12,17 +12,23 @@
 // This file provides convenient APIs to interpret a SourceKitd response.
 //===----------------------------------------------------------------------===//
 
+import Foundation
 import sourcekitd
 
 public class SourceKitdResponse: CustomStringConvertible {
 
   public struct Dictionary: CustomStringConvertible, CustomReflectable {
+    // The lifetime of this sourcekitd_variant_t is tied to the response it came
+    // from, so keep a reference to the response too.
     private let dict: sourcekitd_variant_t
+    private let context: SourceKitdResponse
 
-    public init(dict: sourcekitd_variant_t) {
+
+    public init(dict: sourcekitd_variant_t, context: SourceKitdResponse) {
       assert(sourcekitd_variant_get_type(dict).rawValue ==
         SOURCEKITD_VARIANT_TYPE_DICTIONARY.rawValue)
       self.dict = dict
+      self.context = context
     }
 
     public func getString(_ key: SourceKitdUID) -> String {
@@ -47,12 +53,21 @@ public class SourceKitdResponse: CustomStringConvertible {
 
     public func getArray(_ key: SourceKitdUID) -> Array {
       let value = sourcekitd_variant_dictionary_get_value(dict, key.uid)
-      return Array(arr: value)
+      return Array(arr: value, context: context)
     }
 
     public func getDictionary(_ key: SourceKitdUID) -> Dictionary {
       let value = sourcekitd_variant_dictionary_get_value(dict, key.uid)
-      return Dictionary(dict: value)
+      return Dictionary(dict: value, context: context)
+    }
+
+    public func getData(_ key: SourceKitdUID) -> Data {
+      let value = sourcekitd_variant_dictionary_get_value(dict, key.uid)
+      let size = sourcekitd_variant_data_get_size(value)
+      guard let ptr = sourcekitd_variant_data_get_ptr(value), size > 0 else {
+        return Data()
+      }
+      return Data(bytes: ptr, count: size)
     }
 
     public func getOptional(_ key: SourceKitdUID) -> Variant? {
@@ -61,7 +76,7 @@ public class SourceKitdResponse: CustomStringConvertible {
           SOURCEKITD_VARIANT_TYPE_NULL.rawValue {
         return nil
       }
-      return Variant(val: value)
+      return Variant(val: value, context: context)
     }
 
     public var description: String {
@@ -74,17 +89,21 @@ public class SourceKitdResponse: CustomStringConvertible {
   }
 
   public struct Array: CustomStringConvertible {
+    // The lifetime of this sourcekitd_variant_t is tied to the response it came
+    // from, so keep a reference to the response too.
     private let arr: sourcekitd_variant_t
+    private let context: SourceKitdResponse
 
     public var count: Int {
       let count = sourcekitd_variant_array_get_count(arr)
       return Int(count)
     }
 
-    public init(arr: sourcekitd_variant_t) {
+    public init(arr: sourcekitd_variant_t, context: SourceKitdResponse) {
       assert(sourcekitd_variant_get_type(arr).rawValue ==
           SOURCEKITD_VARIANT_TYPE_ARRAY.rawValue)
       self.arr = arr
+      self.context = context
     }
 
     public func getString(_ index: Int) -> String {
@@ -109,20 +128,21 @@ public class SourceKitdResponse: CustomStringConvertible {
 
     public func getArray(_ index: Int) -> Array {
       let value = sourcekitd_variant_array_get_value(arr, index)
-      return Array(arr: value)
+      return Array(arr: value, context: context)
     }
 
     public func getDictionary(_ index: Int) -> Dictionary {
       let value = sourcekitd_variant_array_get_value(arr, index)
-      return Dictionary(dict: value)
+      return Dictionary(dict: value, context: context)
     }
 
     public func enumerate(_ applier: (_ index: Int, _ value: Variant) -> Bool) {
       // The block passed to sourcekit_variant_array_apply() does not actually
       // escape, it's synchronous and not called after returning.
+      let context = self.context
       withoutActuallyEscaping(applier) { escapingApplier in
         _ = sourcekitd_variant_array_apply(arr) { (index, elem) -> Bool in
-          return escapingApplier(Int(index), Variant(val: elem))
+          return escapingApplier(Int(index), Variant(val: elem, context: context))
         }
       }
     }
@@ -134,10 +154,14 @@ public class SourceKitdResponse: CustomStringConvertible {
   }
 
   public struct Variant: CustomStringConvertible {
+    // The lifetime of this sourcekitd_variant_t is tied to the response it came
+    // from, so keep a reference to the response too.
     private let val: sourcekitd_variant_t
+    fileprivate let context: SourceKitdResponse
 
-    fileprivate init(val: sourcekitd_variant_t) {
+    fileprivate init(val: sourcekitd_variant_t, context: SourceKitdResponse) {
       self.val = val
+      self.context = context
     }
 
     public func getString() -> String {
@@ -167,11 +191,19 @@ public class SourceKitdResponse: CustomStringConvertible {
     }
 
     public func getArray() -> Array {
-      return Array(arr: val)
+      return Array(arr: val, context: context)
     }
 
     public func getDictionary() -> Dictionary {
-      return Dictionary(dict: val)
+      return Dictionary(dict: val, context: context)
+    }
+
+    public func getData() -> Data {
+      let size = sourcekitd_variant_data_get_size(val)
+      guard let ptr = sourcekitd_variant_data_get_ptr(val), size > 0 else {
+        return Data()
+      }
+      return Data(bytes: ptr, count: size)
     }
 
     public var description: String {
@@ -182,7 +214,7 @@ public class SourceKitdResponse: CustomStringConvertible {
   private let resp: sourcekitd_response_t
 
   public var value: Dictionary {
-    return Dictionary(dict: sourcekitd_response_get_value(resp))
+    return Dictionary(dict: sourcekitd_response_get_value(resp), context: self)
   }
 
   /// Copies the raw bytes of the JSON description of this documentation item.

trunk/utils/backtrace-check

@@ -36,19 +36,19 @@ formatting.""")
     args = parser.parse_args()
 
     TARGET_RE = re.compile(
-        "(?P<index>\d+) +(?P<object>\S+) +(?P<address>0x[0-9a-fA-F]{16}) "
-        "(?P<routine>[^+]+) [+] (?P<offset>\d+)")
+        r"(?P<index>\d+) +(?P<object>\S+) +(?P<address>0x[0-9a-fA-F]{16}) "
+        r"(?P<routine>[^+]+) [+] (?P<offset>\d+)")
 
     lines = sys.stdin.readlines()
 
     found_stack_trace_start = False
     found_stack_trace_entry = False
-    for l in lines:
-        l = l.rstrip("\n")
+    for line in lines:
+        line = line.rstrip("\n")
 
         # First see if we found the start of our stack trace start. If so, set
         # the found stack trace flag and continue.
-        if l == "Current stack trace:":
+        if line == "Current stack trace:":
             assert(not found_stack_trace_start)
             found_stack_trace_start = True
             continue
@@ -59,7 +59,7 @@ formatting.""")
             continue
 
         # Ok, we are in the middle of matching a stack trace entry.
-        m = TARGET_RE.match(l)
+        m = TARGET_RE.match(line)
         # If we fail to match, we have exited the stack trace entry region
         if m is None:
             break

trunk/utils/bug_reducer/tests/test_funcbugreducer.py

@@ -117,7 +117,7 @@ def test_basic(self):
                         "$s9testbasic6foo413yyF" in output)
         re_end = 'testfuncbugreducer_testbasic_'
         re_end += '92196894259b5d6c98d1b77f19240904.sib'
-        output_file_re = re.compile('\*\*\* Final File: .*' + re_end)
+        output_file_re = re.compile(r'\*\*\* Final File: .*' + re_end)
         output_matches = [
             1 for o in output if output_file_re.match(o) is not None]
         self.assertEquals(sum(output_matches), 1)

trunk/utils/bug_reducer/tests/test_optbugreducer.py

@@ -105,7 +105,7 @@ def test_basic(self):
         self.assertTrue('*** Found miscompiling passes!' in output)
         self.assertTrue('*** Final Passes: --bug-reducer-tester' in output)
         re_end = 'testoptbugreducer_testbasic_initial'
-        output_file_re = re.compile('\*\*\* Final File: .*' + re_end)
+        output_file_re = re.compile(r'\*\*\* Final File: .*' + re_end)
         output_matches = [
             1 for o in output if output_file_re.match(o) is not None]
         self.assertEquals(sum(output_matches), 1)
@@ -134,7 +134,7 @@ def test_suffix_in_need_of_prefix(self):
         self.assertTrue('*** Found miscompiling passes!' in output)
         self.assertTrue('*** Final Passes: --bug-reducer-tester' in output)
         re_end = 'testoptbugreducer_testsuffixinneedofprefix_initial'
-        output_file_re = re.compile('\*\*\* Final File: .*' + re_end)
+        output_file_re = re.compile(r'\*\*\* Final File: .*' + re_end)
         output_matches = [
             1 for o in output if output_file_re.match(o) is not None]
         self.assertEquals(sum(output_matches), 1)
@@ -167,7 +167,7 @@ def test_reduce_function(self):
         self.assertTrue('*** Final Passes: --bug-reducer-tester' in output)
         re_end = 'testoptbugreducer_testreducefunction_initial_'
         re_end += '30775a3d942671a403702a9846afa7a4.sib'
-        output_file_re = re.compile('\*\*\* Final File: .*' + re_end)
+        output_file_re = re.compile(r'\*\*\* Final File: .*' + re_end)
         output_matches = [
             1 for o in output if output_file_re.match(o) is not None]
         self.assertEquals(sum(output_matches), 1)

trunk/utils/cmpcodesize/cmpcodesize/compare.py

@@ -21,7 +21,7 @@
     ["CPP", re.compile('^(__Z|_+swift)')],
 
     # Objective-C
-    ["ObjC", re.compile('^[+-]\[')],
+    ["ObjC", re.compile(r'^[+-]\[')],
 
     # Swift
     ["Partial Apply", re.compile('^__(TPA|T0.*T[aA]$)')],
@@ -80,7 +80,7 @@ def read_sizes(sizes, file_name, function_details, group_by_prefix):
     architectures = subprocess.check_output(
         ["otool", "-V", "-f", file_name]).split("\n")
     arch = None
-    arch_pattern = re.compile('architecture ([\S]+)')
+    arch_pattern = re.compile(r'architecture ([\S]+)')
     for architecture in architectures:
         arch_match = arch_pattern.match(architecture)
         if arch_match:
@@ -115,10 +115,10 @@ def read_sizes(sizes, file_name, function_details, group_by_prefix):
     start_addr = None
     end_addr = None
 
-    section_pattern = re.compile(' +sectname ([\S]+)')
-    size_pattern = re.compile(' +size ([\da-fx]+)')
-    asmline_pattern = re.compile('^([0-9a-fA-F]+)\s')
-    label_pattern = re.compile('^((\-*\[[^\]]*\])|[^\/\s]+):$')
+    section_pattern = re.compile(r' +sectname ([\S]+)')
+    size_pattern = re.compile(r' +size ([\da-fx]+)')
+    asmline_pattern = re.compile(r'^([0-9a-fA-F]+)\s')
+    label_pattern = re.compile(r'^((\-*\[[^\]]*\])|[^\/\s]+):$')
 
     for line in content:
         asmline_match = asmline_pattern.match(line)

trunk/utils/create-filecheck-test.py

@@ -25,18 +25,18 @@
 args = parser.parse_args()
 
 seen_variables = set([])
-ssa_re = re.compile('[%](\d+)')
-for l in args.input.readlines():
-    l = l[:l.find('//')].rstrip() + "\n"
+ssa_re = re.compile(r'[%](\d+)')
+for line in args.input.readlines():
+    line = line[:line.find('//')].rstrip() + "\n"
     have_match = False
-    for match in ssa_re.finditer(l):
+    for match in ssa_re.finditer(line):
         have_match = True
         var = match.groups()[0]
         if var not in seen_variables:
-            l = l.replace('%' + var, '[[VAR_%s:%%[0-9]+]]' % var)
+            line = line.replace('%' + var, '[[VAR_%s:%%[0-9]+]]' % var)
             seen_variables.add(var)
         else:
-            l = l.replace('%' + var, '[[VAR_%s]]' % var)
+            line = line.replace('%' + var, '[[VAR_%s]]' % var)
     if have_match:
-        l = '// CHECK: ' + l
-    args.o.write(l)
+        line = '// CHECK: ' + line
+    args.o.write(line)

trunk/utils/generate_confusables.py

@@ -57,7 +57,7 @@ def main(args=sys.argv):
 
     pairs = []
     with open(confusablesFilePath, 'r') as f:
-        pattern = re.compile("(.+)\W+;\W+(.+)\W+;")
+        pattern = re.compile(r"(.+)\W+;\W+(.+)\W+;")
         for line in f:
             match = pattern.match(line)
             if match is not None:

trunk/utils/gyb.py

@@ -99,7 +99,7 @@ def split_lines(s):
   )
 ''', re.VERBOSE | re.MULTILINE)
 
-gyb_block_close = re.compile('\}%[ \t]*\n?')
+gyb_block_close = re.compile(r'\}%[ \t]*\n?')
 
 
 def token_pos_to_index(token_pos, start, line_starts):

trunk/utils/jobstats/jobstats.py

@@ -199,7 +199,7 @@ def to_lnt_test_obj(self, args):
 AUXPAT = re.compile(AUXPATSTR)
 
 TIMERPATSTR = (r"time\.swift-(?P<jobkind>\w+)\." + AUXPATSTR +
-               "\.(?P<timerkind>\w+)$")
+               r"\.(?P<timerkind>\w+)$")
 TIMERPAT = re.compile(TIMERPATSTR)
 
 FILEPATSTR = (r"^stats-(?P<start>\d+)-swift-(?P<kind>\w+)-" +
@@ -266,7 +266,7 @@ def find_profiles_in(profiledir, select_stat=[]):
                 if profiletype not in profiles:
                     profiles[profiletype] = dict()
                 profiles[profiletype][counter] = fullpath
-            except:
+            except Exception:
                 pass
     return profiles
 

trunk/utils/pass-pipeline/scripts/pipelines_build_script.py

@@ -24,8 +24,8 @@ def run_build_script_with_data_file(build_script, data_file, verbose=False):
     build_script_args = [
         build_script,
         DEFAULT_PRESENTS,
-        'extra_swift_args=^Swift$;-Xfrontend\;' +
-        '-external-pass-pipeline-filename\;-Xfrontend\;%s' % data_file]
+        r'extra_swift_args=^Swift$;-Xfrontend\;' +
+        r'-external-pass-pipeline-filename\;-Xfrontend\;%s' % data_file]
     sys.stdout.write("Running build script with: %s..." %
                      ' '.join(build_script_args))
     sys.stdout.flush()