Add errors for other invalid strings in digester

Specifically, TypeAttrKinds, DeclAttrKinds, and DeclKinds.

Author: beccadax

include/swift/AST/DiagnosticsCommon.def

@@ -94,11 +94,17 @@ ERROR(function_type_no_parens,none,
       "single argument function types require parentheses", ())
 
 // FIXME: Used by swift-api-digester. Don't want to set up a separate diagnostics
-// file just for two errors.
+// file just for a few errors.
 ERROR(sdk_node_unrecognized_key,none,
       "unrecognized key '%0' in SDK node", (StringRef))
 ERROR(sdk_node_unrecognized_node_kind,none,
       "unrecognized SDK node kind '%0'", (StringRef))
+ERROR(sdk_node_unrecognized_type_attr_kind,none,
+      "unrecognized type attribute '%0' in SDK node", (StringRef))
+ERROR(sdk_node_unrecognized_decl_attr_kind,none,
+      "unrecognized declaration attribute '%0' in SDK node", (StringRef))
+ERROR(sdk_node_unrecognized_decl_kind,none,
+      "unrecognized declaration kind '%0' in SDK node", (StringRef))
 
 //------------------------------------------------------------------------------
 // MARK: Circular reference diagnostics

test/api-digester/diagnostics.json

@@ -4,6 +4,11 @@
   "printedName": "TopLevel",
   "badKey": ["foo", "bar", "baz"],
   "children": [
-    { "kind": "Zyzyx" }
+    {
+      "kind": "Zyzyx",
+      "typeAttributes": ["autoclosure", "fnord", "inout", "Available"],
+      "declAttributes": ["Available", "Fnord", "ObjC", "inout"],
+      "declKind": "Subroutine"
+    }
   ]
 }

test/api-digester/diagnostics.swift

@@ -2,7 +2,12 @@
 // RUN: not %api-digester -deserialize-sdk -input-paths %S/diagnostics.json -o - 2>&1 | %FileCheck %s
 
 // CHECK: diagnostics.json:5:3: error: unrecognized key 'badKey' in SDK node
-// CHECK: diagnostics.json:7:15: error: unrecognized SDK node kind 'Zyzyx'
+// CHECK: diagnostics.json:8:15: error: unrecognized SDK node kind 'Zyzyx'
+// CHECK: diagnostics.json:9:41: error: unrecognized type attribute 'fnord' in SDK node
+// CHECK: diagnostics.json:9:59: error: unrecognized type attribute 'Available' in SDK node
+// CHECK: diagnostics.json:10:39: error: unrecognized declaration attribute 'Fnord' in SDK node
+// CHECK: diagnostics.json:10:56: error: unrecognized declaration attribute 'inout' in SDK node
+// CHECK: diagnostics.json:11:19: error: unrecognized declaration kind 'Subroutine' in SDK node
 
 // Make sure we don't try to output a result:
 // CHECK-NOT: "kind": "Root",

tools/swift-api-digester/swift-api-digester.cpp

@@ -1139,36 +1139,47 @@ SDKNode* SDKNode::constructSDKNode(SDKContext &Ctx,
         auto *Seq = cast<llvm::yaml::SequenceNode>(Pair.getValue());
         std::transform(Seq->begin(), Seq->end(),
                        std::back_inserter(Info.TypeAttrs),
-          [](llvm::yaml::Node &N) {
+          [&](llvm::yaml::Node &N) {
             auto Result = llvm::StringSwitch<TypeAttrKind>(GetScalarString(&N))
   #define TYPE_ATTR(X) .Case(#X, TypeAttrKind::TAK_##X)
   #include "swift/AST/Attr.def"
             .Default(TypeAttrKind::TAK_Count);
-            assert(Result != TypeAttrKind::TAK_Count);
+            if (Result == TAK_Count)
+              Ctx.diagnose(&N, diag::sdk_node_unrecognized_type_attr_kind,
+                           GetScalarString(&N));
             return Result;
           });
         break;
       }
       case KeyKind::KK_declAttributes: {
         auto *Seq = cast<llvm::yaml::SequenceNode>(Pair.getValue());
         std::transform(Seq->begin(), Seq->end(), std::back_inserter(Info.DeclAttrs),
-          [](llvm::yaml::Node &N) {
+          [&](llvm::yaml::Node &N) {
             auto Result = llvm::StringSwitch<DeclAttrKind>(GetScalarString(&N))
   #define DECL_ATTR(_, NAME, ...) .Case(#NAME, DeclAttrKind::DAK_##NAME)
   #include "swift/AST/Attr.def"
             .Default(DeclAttrKind::DAK_Count);
-            assert(Result != DeclAttrKind::DAK_Count);
+            if (Result == DAK_Count)
+              Ctx.diagnose(&N, diag::sdk_node_unrecognized_decl_attr_kind,
+                           GetScalarString(&N));
             return Result;
           });
         break;
       }
-      case KeyKind::KK_declKind:
-        Info.DKind = llvm::StringSwitch<DeclKind>(GetScalarString(Pair.getValue()))
+      case KeyKind::KK_declKind: {
+        auto dKind = llvm::StringSwitch<Optional<DeclKind>>(
+          GetScalarString(Pair.getValue()))
   #define DECL(X, PARENT) .Case(#X, DeclKind::X)
   #include "swift/AST/DeclNodes.def"
-        ;
+        .Default(None);
+        if (dKind)
+          Info.DKind = *dKind;
+        else
+          Ctx.diagnose(Pair.getValue(), diag::sdk_node_unrecognized_decl_kind,
+                       GetScalarString(Pair.getValue()));
         break;
       }
+      }
     }
     else {
       Ctx.diagnose(Pair.getKey(), diag::sdk_node_unrecognized_key,