Address review feedback.

Author: allevato

lib/AST/ASTDumper.cpp

@@ -1323,21 +1323,21 @@ namespace {
 
       printField(requirement.getKind(), Label::optional("kind"));
 
-      if (requirement.getKind() != RequirementKind::Layout &&
-          requirement.getSecondType()) {
-        if (Writer.isParsable()) {
-          // If this is a conformance requirement, print the USR of the protocol
-          // decl instead of the type. The type USR for a protocol is based on
-          // the equivalent expanded existential, which drops suppressed
-          // protocols.
-          if (requirement.getKind() == RequirementKind::Conformance) {
+      if (requirement.getKind() != RequirementKind::Layout) {
+        // If this is a conformance requirement, print the USR of the protocol
+        // decl instead of the type. The type USR for a protocol is based on
+        // the equivalent expanded existential, which drops suppressed
+        // protocols.
+        switch (requirement.getKind()) {
+        case RequirementKind::Conformance:
+          if (Writer.isParsable()) {
             printReferencedDeclField(requirement.getProtocolDecl(),
                                      Label::optional("protocol"));
-          } else {
-            printTypeField(requirement.getSecondType(),
-                           Label::optional("second_type"), opts);
+            break;
           }
-        } else {
+          // Fallthrough to the original behavior for non-parsable output.
+          LLVM_FALLTHROUGH;
+        default:
           printTypeField(requirement.getSecondType(),
                          Label::optional("second_type"), opts);
         }
@@ -2022,8 +2022,8 @@ namespace {
                 Label::always("conformances"));
 
             if (auto CD = dyn_cast<ClassDecl>(DC); CD && CD->hasSuperclass()) {
-              printReferencedDeclField(CD->getSuperclassDecl(),
-                                       Label::always("superclass_decl_usr"));
+              printTypeField(CD->getSuperclass(),
+                             Label::always("superclass_type"));
             }
 
             if (auto ED = dyn_cast<EnumDecl>(DC); ED && ED->hasRawType()) {