Merge pull request #3041 from jckarter/property-behavior-flag

Author: swift-ci

docs/ABI.rst

@@ -782,6 +782,11 @@ Globals
   global ::= 'TV' global                 // vtable override thunk
   global ::= 'TW' protocol-conformance entity
                                          // protocol witness thunk
+  global ::= 'TB' identifier context identifier
+                                         // property behavior initializer thunk
+  global ::= 'Tb' identifier context identifier
+                                         // property behavior setter thunk
+
   entity ::= nominal-type                // named type declaration
   entity ::= static? entity-kind context entity-name
   entity-kind ::= 'F'                    // function (ctor, accessor, etc.)

include/swift/Parse/Tokens.def

@@ -144,7 +144,6 @@ KEYWORD(__LINE__)
 KEYWORD(__COLUMN__)
 KEYWORD(__FUNCTION__)
 KEYWORD(__DSO_HANDLE__)
-KEYWORD(__behavior)
 
 // Pattern keywords.
 KEYWORD(_)

lib/Parse/ParseDecl.cpp

@@ -4200,7 +4200,10 @@ ParserStatus Parser::parseDeclVar(ParseDeclOptions Flags,
     }
 
     // Parse a behavior block if present.
-    if (consumeIf(tok::kw___behavior)) {
+    if (Context.LangOpts.EnableExperimentalPropertyBehaviors
+        && Tok.is(tok::identifier)
+        && Tok.getRawText().equals("__behavior")) {
+      consumeToken(tok::identifier);
       auto type = parseType(diag::expected_behavior_name,
                             /*handle completion*/ true);
       if (type.isParseError())

test/SILGen/property_behavior_init.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s
+// RUN: %target-swift-frontend -enable-experimental-property-behaviors -emit-silgen %s | FileCheck %s
 protocol diBehavior {
   associatedtype Value
   var storage: Value { get set }