Merge pull request #77436 from DougGregor/parse-expression-macro-buffer-as-expression

Author: DougGregor

include/swift/AST/DiagnosticsParse.def

@@ -2095,6 +2095,8 @@ ERROR(unexpected_attribute_expansion,PointsToFirstBadToken,
 ERROR(unexpected_member_expansion,PointsToFirstBadToken,
       "unexpected token '%0' in expanded member list",
       (StringRef))
+ERROR(extra_tokens_after_expression,PointsToFirstBadToken,
+      "extra tokens after expression in macro expansion", ())
 
 ERROR(parser_round_trip_error,none,
       "source file did not round-trip through the new Swift parser", ())

lib/Parse/ParseRequests.cpp

@@ -310,10 +310,27 @@ SourceFileParsingResult parseSourceFile(SourceFile &SF) {
       break;
 
     case GeneratedSourceInfo::ExpressionMacroExpansion:
+    case GeneratedSourceInfo::DefaultArgument: {
+      // Prime the lexer.
+      if (parser.Tok.is(tok::NUM_TOKENS))
+        parser.consumeTokenWithoutFeedingReceiver();
+
+      ParserResult<Expr> resultExpr = parser.parseExpr(diag::expected_expr);
+      if (auto expr = resultExpr.getPtrOrNull())
+        items.push_back(expr);
+
+      if (!parser.Tok.is(tok::eof)) {
+        parser.diagnose(parser.Tok, diag::extra_tokens_after_expression);
+        while (!parser.Tok.is(tok::eof))
+          parser.consumeToken();
+      }
+
+      break;
+    }
+
     case GeneratedSourceInfo::PreambleMacroExpansion:
     case GeneratedSourceInfo::ReplacedFunctionBody:
-    case GeneratedSourceInfo::PrettyPrinted:
-    case GeneratedSourceInfo::DefaultArgument: {
+    case GeneratedSourceInfo::PrettyPrinted:{
       parser.parseTopLevelItems(items);
       break;
     }

lib/Sema/TypeCheckMacros.cpp

@@ -199,6 +199,14 @@ MacroDefinition MacroDefinitionRequest::evaluate(
   if (!typeCheckedType)
     return MacroDefinition::forInvalid();
 
+  // If the expanded macro was one of the the magic literal expressions
+  // (like #file), there's nothing to expand.
+  if (auto magicLiteral =
+          dyn_cast<MagicIdentifierLiteralExpr>(definition)) {
+    StringRef expansionText = externalMacroName.unbridged();
+    return MacroDefinition::forExpanded(ctx, expansionText, { }, { });
+  }
+
   // Dig out the macro that was expanded.
   auto expansion = cast<MacroExpansionExpr>(definition);
   auto expandedMacro =
@@ -1105,9 +1113,10 @@ evaluateFreestandingMacro(FreestandingMacroExpansion *expansion,
       return nullptr;
 
     case BuiltinMacroKind::IsolationMacro:
-      // Create a buffer full of scratch space; this will be populated
-      // much later.
-      std::string scratchSpace(128, ' ');
+      // Create a buffer with "nil" plus a bunch of scratch space. This
+      // will be populated much later.
+      std::string scratchSpace = "nil";
+      scratchSpace.append(125, ' ');
       evaluatedSource = llvm::MemoryBuffer::getMemBufferCopy(
           scratchSpace,
           adjustMacroExpansionBufferName(*discriminator));

test/Macros/macro_expand_other.swift

@@ -36,4 +36,9 @@ func testFreestandingExpansionOfOther() {
   #endif
 }
 
+@freestanding(expression)
+macro myLineMacro() -> Int = #line
+
+var thisLine = #myLineMacro
+
 testFreestandingExpansionOfOther()