Merge pull request #79771 from DougGregor/more-unsafe-disambig

Author: DougGregor

lib/Parse/ParseExpr.cpp

@@ -439,7 +439,8 @@ ParserResult<Expr> Parser::parseExprSequenceElement(Diag<> message,
   if (Tok.isContextualKeyword("unsafe") &&
       !(peekToken().isAtStartOfLine() ||
         peekToken().isAny(tok::r_paren, tok::r_brace, tok::r_square,
-                          tok::equal) ||
+                          tok::equal, tok::colon, tok::comma) ||
+        (isExprBasic && peekToken().is(tok::l_brace)) ||
         peekToken().is(tok::period))) {
     Tok.setKind(tok::contextual_keyword);
     SourceLoc unsafeLoc = consumeToken();

test/Unsafe/safe.swift

@@ -179,17 +179,25 @@ enum Color {
 case red
 }
 
+func acceptBools(_: Bool, _: Bool) { }
+
+func acceptBoolsUnsafeLabel(unsafe _: Bool, _: Bool) { }
+
 func unsafeFun() {
   var unsafe = true
   unsafe = false
   unsafe.toggle()
   _ = [unsafe]
   _ = { unsafe }
+  acceptBools(unsafe, unsafe)
+  acceptBoolsUnsafeLabel(unsafe: unsafe, unsafe)
 
   let color: Color
   // expected-warning@+1{{no unsafe operations occur within 'unsafe' expression}}
   color = unsafe .red
   _ = color
+
+  if unsafe { }
 }
 
 // @safe suppresses unsafe-type-related diagnostics on an entity