---

yaml
---
r: 349394
b: refs/heads/master-next
c: c02c001
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: d58a1d5c0d5fcc0710c42d23e5edc09abd626bc6
+refs/heads/master-next: c02c0017364c82109bbd8d3528fa14848eb13c1b
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/IRGen/IRGenFunction.h

@@ -663,7 +663,7 @@ class IRGenFunction {
   llvm::Value *LocalSelf = nullptr;
   /// If set, the dynamic Self type is assumed to be equivalent to this exact class.
   CanType LocalSelfType;
-  bool LocalSelfIsExact;
+  bool LocalSelfIsExact = false;
   LocalSelfKind SelfKind;
 };
 

branches/master-next/lib/Parse/SyntaxParsingContext.cpp

@@ -258,10 +258,13 @@ ParsedRawSyntaxNode SyntaxParsingContext::finalizeSourceFile() {
   Parts = Parts.drop_back();
 
   for (auto RawNode : Parts) {
-    if (RawNode.getKind() != SyntaxKind::CodeBlockItem)
+    if (RawNode.getKind() != SyntaxKind::CodeBlockItem) {
       // FIXME: Skip toplevel garbage nodes for now. we shouldn't emit them in
       // the first place.
+      if (RawNode.isRecorded())
+        getSyntaxCreator().finalizeNode(RawNode.getOpaqueNode());
       continue;
+    }
 
     AllTopLevel.push_back(RawNode);
   }

branches/master-next/lib/Sema/TypeCheckDecl.cpp

@@ -3501,7 +3501,9 @@ void bindFuncDeclToOperator(TypeChecker &TC, FuncDecl *FD) {
       for (DeclContext *CurContext = FD->getLocalContext();
            !isa<SourceFile>(CurContext);
            CurContext = CurContext->getParent()) {
-        insertionLoc = CurContext->getAsDecl()->getStartLoc();
+        // Skip over non-decl contexts (e.g. closure expresssions)
+        if (auto *D = CurContext->getAsDecl())
+            insertionLoc = D->getStartLoc();
       }
     }
 

branches/master-next/validation-test/compiler_crashers_2_fixed/0204-rdar54150921.swift

@@ -0,0 +1,4 @@
+// RUN: not %target-swift-frontend -typecheck %s
+{
+  static func ??= (lhs: inout Optional, rhs: Optional) {}
+}