Merge pull request #62123 from DougGregor/pretty-stack-trace-macros

Author: DougGregor

lib/AST/Expr.cpp

@@ -832,6 +832,8 @@ ArgumentList *Expr::getArgs() const {
     return DSE->getArgs();
   if (auto *OLE = dyn_cast<ObjectLiteralExpr>(this))
     return OLE->getArgs();
+  if (auto *ME = dyn_cast<MacroExpansionExpr>(this))
+    return ME->getArgs();
   return nullptr;
 }
 

lib/Sema/CSSimplify.cpp

@@ -5541,10 +5541,12 @@ bool ConstraintSystem::repairFailures(
 
       if (auto overload = findSelectedOverloadFor(calleeLocator)) {
         if (auto *decl = overload->choice.getDeclOrNull()) {
-          if (getParameterList(decl)->get(paramIdx)->getTypeOfDefaultExpr()) {
-            conversionsOrFixes.push_back(
-                IgnoreDefaultExprTypeMismatch::create(*this, lhs, rhs, loc));
-            break;
+          if (auto paramList = getParameterList(decl)) {
+            if (paramList->get(paramIdx)->getTypeOfDefaultExpr()) {
+              conversionsOrFixes.push_back(
+                  IgnoreDefaultExprTypeMismatch::create(*this, lhs, rhs, loc));
+              break;
+            }
           }
         }
       }

lib/Sema/TypeCheckMacros.cpp

@@ -19,6 +19,7 @@
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/CompilerPlugin.h"
 #include "swift/AST/Expr.h"
+#include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/Defer.h"
@@ -163,8 +164,6 @@ getMacroSignature(
       typealias->getGenericSignature(), typealias->getUnderlyingType());
 }
 
-
-
 /// Create a macro.
 static MacroDecl *createMacro(
     ModuleDecl *mod, Identifier macroName,
@@ -368,8 +367,10 @@ Expr *swift::expandMacroExpr(
   NullTerminatedStringRef evaluatedSource;
 
   MacroDecl *macro = cast<MacroDecl>(macroRef.getDecl());
+  {
+    PrettyStackTraceExpr debugStack(ctx, "expanding macro", expr);
 
-  switch (macro->implementationKind) {
+    switch (macro->implementationKind) {
     case MacroDecl::ImplementationKind::Builtin: {
       // Builtin macros are handled via ASTGen.
       auto astGenSourceFile = sourceFile->exportedSourceFile;
@@ -380,8 +381,8 @@ Expr *swift::expandMacroExpr(
       const char *evaluatedSourceAddress;
       ptrdiff_t evaluatedSourceLength;
       swift_ASTGen_evaluateMacro(
-           astGenSourceFile, expr->getStartLoc().getOpaquePointerValue(),
-           &evaluatedSourceAddress, &evaluatedSourceLength);
+          astGenSourceFile, expr->getStartLoc().getOpaquePointerValue(),
+          &evaluatedSourceAddress, &evaluatedSourceLength);
       if (!evaluatedSourceAddress)
         return nullptr;
       evaluatedSource = NullTerminatedStringRef(evaluatedSourceAddress,
@@ -394,18 +395,19 @@ Expr *swift::expandMacroExpr(
       auto bufferID = sourceFile->getBufferID();
       auto sourceFileText = sourceMgr.getEntireTextForBuffer(*bufferID);
       auto evaluated = plugin->invokeRewrite(
-          /*targetModuleName*/ dc->getParentModule()->getName().str(),
-          /*filePath*/ sourceFile->getFilename(),
-          /*sourceFileText*/ sourceFileText,
-          /*range*/ Lexer::getCharSourceRangeFromSourceRange(
-              sourceMgr, expr->getSourceRange()),
-          ctx);
+         /*targetModuleName*/ dc->getParentModule()->getName().str(),
+         /*filePath*/ sourceFile->getFilename(),
+         /*sourceFileText*/ sourceFileText,
+         /*range*/ Lexer::getCharSourceRangeFromSourceRange(
+             sourceMgr, expr->getSourceRange()),
+         ctx);
       if (evaluated)
         evaluatedSource = *evaluated;
       else
         return nullptr;
       break;
     }
+    }
   }
 
   // Figure out a reasonable name for the macro expansion buffer.
@@ -481,6 +483,8 @@ Expr *swift::expandMacroExpr(
     ContextualTypePurpose::CTP_CoerceOperand
   };
 
+  PrettyStackTraceExpr debugStack(
+      ctx, "type checking expanded macro", expandedExpr);
   Type realExpandedType = TypeChecker::typeCheckExpression(
       expandedExpr, dc, contextualType);
   if (!realExpandedType)