[Macros] Don't stop lookup early if we found a macro.

Author: DougGregor

lib/AST/ModuleNameLookup.cpp

@@ -176,10 +176,12 @@ void ModuleNameLookup<LookupStrategy>::lookupInModule(
                          getDerived()->canReturnEarly());
   if (canReturnEarly &&
       resolutionKind == ResolutionKind::Overloadable) {
-    // If we only found top-level functions, keep looking, since we may
-    // find additional overloads.
+    // If we only found top-level functions or macros, keep looking, since
+    // we may find additional overloads.
     if (std::all_of(decls.begin() + initialCount, decls.end(),
-                    [](ValueDecl *VD) { return isa<FuncDecl>(VD); }))
+                    [](ValueDecl *VD) {
+      return isa<FuncDecl>(VD) || isa<MacroDecl>(VD);
+    }))
       canReturnEarly = false;
   }
 

test/Macros/macro_expand_variadic.swift

@@ -9,15 +9,15 @@
 // FIXME: Swift parser is not enabled on Linux CI yet.
 // REQUIRES: OS=macosx
 
-@expression macro varPrint<Value...>(_ value: Value...) = MacroDefinition.PrintMacro
+@expression macro print<Value...>(_ value: Value...) = MacroDefinition.PrintMacro
 
 func testIt() {
   // CHECK: hello
   // CHECK: [1, 2, 3, 4, 5]
-  #varPrint("hello", [1, 2, 3, 4, 5])
+  #print("hello", [1, 2, 3, 4, 5])
 
   // CHECK: world
-  #varPrint("world")
+  #print("world")
 }
 
 testIt()