---

yaml
---
r: 347228
b: refs/heads/master
c: 83d6c1e
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -314,6 +314,7 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options
       "-c"
+      "-Xfrontend" "-enable-sil-ownership"
       "-target" "${target}"
       "-${BENCH_COMPILE_ARCHOPTS_OPT}" ${PAGE_ALIGNMENT_OPTION})
 
@@ -343,6 +344,7 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options_driver
       "-c"
+      "-Xfrontend" "-enable-sil-ownership"
       "-target" "${target}"
       "-${driver_opt}")
 

trunk/lib/Parse/ParseType.cpp

@@ -729,11 +729,12 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
     addType(ty.getPtrOrNull());
   } while (Tok.isContextualPunctuator("&"));
 
-  if (SyntaxContext->isEnabled() && Status.isSuccess()) {
-    auto LastNode = ParsedSyntaxRecorder::makeCompositionTypeElement(
-        SyntaxContext->popIf<ParsedTypeSyntax>().getValue(), None,
-        *SyntaxContext);
-    SyntaxContext->addSyntax(LastNode);
+  if (SyntaxContext->isEnabled()) {
+    if (auto synType = SyntaxContext->popIf<ParsedTypeSyntax>()) {
+      auto LastNode = ParsedSyntaxRecorder::makeCompositionTypeElement(
+          synType.getValue(), None, *SyntaxContext);
+      SyntaxContext->addSyntax(LastNode);
+    }
   }
   SyntaxContext->collectNodesInPlace(SyntaxKind::CompositionTypeElementList);
 

trunk/test/Syntax/Parser/fixed_crashers.swift

@@ -2,4 +2,7 @@
 // RUN: %swift-syntax-parser-test %s -dump-tree | %FileCheck %s
 
 let x: a[i] & b
-// CHECK: |let|
+// CHECK: |x|
+
+let x2: a & b[1]
+// CHECK: |x2|