ASTDumper: Better dumping of the thrown error type of a function type

slavapestov · slavapestov · commit c4e0c9664143 · 2023-10-26T12:11:37.000-04:00
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -4224,16 +4224,16 @@ namespace {
         printFlag(T->isAsync(), "async");
         printFlag(T->isThrowing(), "throws");
       }
-      if (Type thrownError = T->getThrownError()) {
-        printFieldQuoted(thrownError.getString(), "thrown_error");
-      }
       if (Type globalActor = T->getGlobalActor()) {
         printFieldQuoted(globalActor.getString(), "global_actor");
       }
 
       printClangTypeRec(T->getClangTypeInfo(), T->getASTContext());
       printAnyFunctionParamsRec(T->getParams(), "input");
       printRec(T->getResult(), "output");
+      if (Type thrownError = T->getThrownError()) {
+        printRec(thrownError, "thrown_error");
+      }
     }
 
     void visitFunctionType(FunctionType *T, StringRef label) {

Original file line number	Diff line number	Diff line change
`@@ -4224,16 +4224,16 @@ namespace {`
`4224`	`4224`	`printFlag(T->isAsync(), "async");`
`4225`	`4225`	`printFlag(T->isThrowing(), "throws");`
`4226`	`4226`	`}`
`4227`		`- if (Type thrownError = T->getThrownError()) {`
`4228`		`- printFieldQuoted(thrownError.getString(), "thrown_error");`
`4229`		`- }`
`4230`	`4227`	`if (Type globalActor = T->getGlobalActor()) {`
`4231`	`4228`	`printFieldQuoted(globalActor.getString(), "global_actor");`
`4232`	`4229`	`}`
`4233`	`4230`
`4234`	`4231`	`printClangTypeRec(T->getClangTypeInfo(), T->getASTContext());`
`4235`	`4232`	`printAnyFunctionParamsRec(T->getParams(), "input");`
`4236`	`4233`	`printRec(T->getResult(), "output");`
	`4234`	`+ if (Type thrownError = T->getThrownError()) {`
	`4235`	`+ printRec(thrownError, "thrown_error");`
	`4236`	`+ }`
`4237`	`4237`	`}`
`4238`	`4238`
`4239`	`4239`	`void visitFunctionType(FunctionType *T, StringRef label) {`