---

yaml
---
r: 340926
b: refs/heads/rxwei-patch-1
c: f596392
h: refs/heads/master

Author: shahmishal

[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: 21cbc868efc17209567b985128db7f2279b1c648
+refs/heads/rxwei-patch-1: f5963923de41d011c25f6bc9e2badc3bb92eae7b
 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/lib/Sema/CSDiagnostics.cpp

@@ -2671,31 +2671,21 @@ bool ClosureParamDestructuringFailure::diagnoseAsError() {
   auto bodyStmts = closureBody->getElements();
 
   SourceLoc bodyLoc;
-  SourceLoc inLoc = closure->getInLoc();
-  // If location for `in` is unknown we can't proceed
-  // since we'll not be able to figure out source line
-  // to place the fix-it on.
-  if (inLoc.isInvalid())
-    return true;
-
   // If the body is empty let's put the cursor
   // right after "in", otherwise make it start
   // location of the first statement in the body.
   if (bodyStmts.empty())
-    bodyLoc = Lexer::getLocForEndOfToken(sourceMgr, inLoc);
+    bodyLoc = Lexer::getLocForEndOfToken(sourceMgr, closure->getInLoc());
   else
     bodyLoc = bodyStmts.front().getStartLoc();
 
-  if (bodyLoc.isInvalid())
-    return true;
-
   SmallString<64> fixIt;
   llvm::raw_svector_ostream OS(fixIt);
 
   // If this is multi-line closure we'd have to insert new lines
   // in the suggested 'let' to keep the structure of the code intact,
   // otherwise just use ';' to keep everything on the same line.
-  auto inLine = sourceMgr.getLineNumber(inLoc);
+  auto inLine = sourceMgr.getLineNumber(closure->getInLoc());
   auto bodyLine = sourceMgr.getLineNumber(bodyLoc);
   auto isMultiLineClosure = bodyLine > inLine;
   auto indent =

branches/rxwei-patch-1/test/IRGen/abi_v7k.swift

@@ -142,7 +142,7 @@ func testClike8(t: Int, x: CLike8) -> Int {
 // assigned values in the data area of the enum in declaration order
 // CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A7SingleP{{.*}}"(i32, i32, i8)
 // CHECK: br i1
-// CHECK: switch i64 [[ID:%[0-9]+]]
+// CHECK: switch i32 [[ID:%[0-9]+]]
 // CHECK: [[FIRST:%[0-9]+]] = zext i32 %0 to i64
 // CHECK: [[SECOND:%[0-9]+]] = zext i32 %1 to i64
 // CHECK: [[TEMP:%[0-9]+]] = shl i64 [[SECOND]], 32

branches/rxwei-patch-1/utils/update_checkout/update_checkout/update_checkout.py

@@ -17,7 +17,6 @@
 import re
 import sys
 import traceback
-
 from functools import reduce
 from multiprocessing import freeze_support
 
@@ -309,49 +308,42 @@ def obtain_all_additional_swift_sources(args, config, with_ssh, scheme_name,
                               args.n_processes)
 
 
-def dump_repo_hashes(config):
+def dump_repo_hashes(config, branch_scheme_name='repro'):
     """
     Dumps the current state of the repo into a new config file that contains a
     master branch scheme with the relevant branches set to the appropriate
     hashes.
     """
-    branch_scheme_name = 'repro'
     new_config = {}
     config_copy_keys = ['ssh-clone-pattern', 'https-clone-pattern', 'repos']
     for config_copy_key in config_copy_keys:
         new_config[config_copy_key] = config[config_copy_key]
     repos = {}
+    repos = repo_hashes(config)
     branch_scheme = {'aliases': [branch_scheme_name], 'repos': repos}
     new_config['branch-schemes'] = {branch_scheme_name: branch_scheme}
-    for repo_name, repo_info in sorted(config['repos'].items(),
-                                       key=lambda x: x[0]):
-        with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
-                         dry_run=False,
-                         echo=False):
-            h = shell.capture(["git", "rev-parse", "HEAD"],
-                              echo=False).strip()
-            repos[repo_name] = str(h)
     json.dump(new_config, sys.stdout, indent=4)
 
 
-def dump_hashes_config(args, config):
-    branch_scheme_name = args.dump_hashes_config
-    new_config = {}
-    config_copy_keys = ['ssh-clone-pattern', 'https-clone-pattern', 'repos']
-    for config_copy_key in config_copy_keys:
-        new_config[config_copy_key] = config[config_copy_key]
+def repo_hashes(config):
     repos = {}
-    branch_scheme = {'aliases': [branch_scheme_name], 'repos': repos}
-    new_config['branch-schemes'] = {args.dump_hashes_config: branch_scheme}
     for repo_name, repo_info in sorted(config['repos'].items(),
                                        key=lambda x: x[0]):
-        with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
-                         dry_run=False,
-                         echo=False):
-            h = shell.capture(["git", "rev-parse", "HEAD"],
-                              echo=False).strip()
-            repos[repo_name] = str(h)
-    json.dump(new_config, sys.stdout, indent=4)
+        repo_path = os.path.join(SWIFT_SOURCE_ROOT, repo_name)
+        if os.path.exists(repo_path):
+            with shell.pushd(repo_path, dry_run=False, echo=False):
+                h = shell.capture(["git", "rev-parse", "HEAD"],
+                                  echo=False).strip()
+        else:
+            h = 'skip'
+        repos[repo_name] = str(h)
+    return repos
+
+
+def print_repo_hashes(config):
+    repos = repo_hashes(config)
+    for repo_name, repo_hash in repos.iteritems():
+        print("{:<35}: {:<35}".format(repo_name, repo_hash))
 
 
 def validate_config(config):
@@ -520,7 +512,7 @@ def main():
         return (None, None)
 
     if args.dump_hashes_config:
-        dump_hashes_config(args, config)
+        dump_repo_hashes(config, args.dump_hashes_config)
         return (None, None)
 
     cross_repos_pr = {}
@@ -563,4 +555,5 @@ def main():
         print("update-checkout failed, fix errors and try again")
     else:
         print("update-checkout succeeded")
+        print_repo_hashes(config)
     sys.exit(fail_count)