[Parse] isNonNull() check before constructing InOutTypeRepr (#5361)

rintaro · web-flow · commit 8a9c8d579f71 · 2016-10-20T08:18:00.000+09:00
Fixes 2 compiler crashers
diff --git a/lib/Parse/ParseType.cpp b/lib/Parse/ParseType.cpp
@@ -142,7 +142,7 @@ ParserResult<TypeRepr> Parser::parseTypeSimple(Diag<> MessageID,
   }
 
   // If we parsed an inout modifier, prepend it.
-  if (InOutLoc.isValid())
+  if (InOutLoc.isValid() && ty.isNonNull())
     ty = makeParserResult(new (Context) InOutTypeRepr(ty.get(),
                                                       InOutLoc));
 
diff --git a/validation-test/SIL/crashers/003-swift-parser-parsetypesimple.sil b/validation-test/SIL/crashers/003-swift-parser-parsetypesimple.sil
diff --git a/validation-test/SIL/crashers_fixed/003-swift-parser-parsetypesimple.sil b/validation-test/SIL/crashers_fixed/003-swift-parser-parsetypesimple.sil
@@ -0,0 +1,3 @@
+// RUN: not %target-sil-opt %s
+// REQUIRES: asserts
+func x:inout p<
diff --git a/validation-test/SIL/crashers_fixed/046-swift-parser-parsetypesimpleorcomposition.sil b/validation-test/SIL/crashers_fixed/046-swift-parser-parsetypesimpleorcomposition.sil
@@ -1,3 +1,3 @@
-// RUN: not --crash %target-sil-opt %s
+// RUN: not %target-sil-opt %s
 // REQUIRES: asserts
 {struct R{func o:inout p<

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ ParserResult<TypeRepr> Parser::parseTypeSimple(Diag<> MessageID,`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`// If we parsed an inout modifier, prepend it.`
`145`		`- if (InOutLoc.isValid())`
	`145`	`+ if (InOutLoc.isValid() && ty.isNonNull())`
`146`	`146`	`ty = makeParserResult(new (Context) InOutTypeRepr(ty.get(),`
`147`	`147`	`InOutLoc));`
`148`	`148`