Fix merge again.

Author: rxwei

lib/AST/UnqualifiedLookup.cpp

@@ -283,7 +283,7 @@ void UnqualifiedLookupFactory::performUnqualifiedLookup() {
         !options.contains(UnqualifiedLookupFlags::MacroLookup))
       lookInASTScopes();
   } else {
-    assert((DC->isModuleScopeContext() || !DC->getParentSourceFile()) &&
+    assert((DC->isModuleScopeContext() || !sf) &&
            "Unqualified lookup without a source location must start from "
            "a module-scope context");
 

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -222,7 +222,8 @@ func evaluateMacro(
         print("not a macro expansion decl; found \(parentSyntax.kind)")
         return -1
       }
-      evaluatedSyntax = Syntax(try codeItemMacro.expansion(of: parentExpansion, in: &context))
+      evaluatedSyntax = try Syntax(CodeBlockItemListSyntax(
+        codeItemMacro.expansion(of: parentExpansion, in: &context)))
       macroName = parentExpansion.macro.withoutTrivia().description
 
     default: