---

yaml
---
r: 340927
b: refs/heads/rxwei-patch-1
c: 238f10c
h: refs/heads/master
i:
  340925: a22f082
  340923: 2a33ab5
  340919: dd26165
  340911: a0c92b0
  340895: e058457
  340863: 4b2932a

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: f5963923de41d011c25f6bc9e2badc3bb92eae7b
+refs/heads/rxwei-patch-1: 238f10cbcc5297a4c6d233619425c81c7b32b1a3
 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,21 +2671,31 @@ 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, closure->getInLoc());
+    bodyLoc = Lexer::getLocForEndOfToken(sourceMgr, inLoc);
   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(closure->getInLoc());
+  auto inLine = sourceMgr.getLineNumber(inLoc);
   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 i32 [[ID:%[0-9]+]]
+// CHECK: switch i64 [[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/validation-test/Sema/type_checker_crashers_fixed/rdar51576862.swift

@@ -0,0 +1,5 @@
+// RUN: not %target-swift-frontend %s -typecheck
+
+func foo() -> [String] {
+  let dict: [String: String] = [:]
+  return dict.filter({ (_