[NFC] Improve lookup flag printing facilities

Author: beccadax

include/swift/AST/NameLookup.h

@@ -253,6 +253,8 @@ enum class UnqualifiedLookupFlags {
   /// This lookup should include members that would otherwise be filtered out
   /// because they come from a module that has not been imported.
   IgnoreMissingImports = 1 << 10,
+
+  // Reminder: If you add a flag, make sure you update simple_display() below
 };
 
 using UnqualifiedLookupOptions = OptionSet<UnqualifiedLookupFlags>;

lib/AST/NameLookup.cpp

@@ -118,6 +118,8 @@ void swift::simple_display(llvm::raw_ostream &out,
       {UnqualifiedLookupFlags::TypeLookup, "TypeLookup"},
       {UnqualifiedLookupFlags::MacroLookup, "MacroLookup"},
       {UnqualifiedLookupFlags::ModuleLookup, "ModuleLookup"},
+      {UnqualifiedLookupFlags::DisregardSelfBounds, "DisregardSelfBounds"},
+      {UnqualifiedLookupFlags::IgnoreMissingImports, "IgnoreMissingImports"},
   };
 
   auto flagsToPrint = llvm::make_filter_range(

lib/Sema/TypeCheckNameLookup.cpp

@@ -32,6 +32,26 @@
 
 using namespace swift;
 
+void swift::simple_display(llvm::raw_ostream &out, NameLookupOptions options) {
+  using Flag = std::pair<NameLookupFlags, StringRef>;
+  Flag possibleFlags[] = {
+      {NameLookupFlags::IgnoreAccessControl, "IgnoreAccessControl"},
+      {NameLookupFlags::IncludeOuterResults, "IncludeOuterResults"},
+      {NameLookupFlags::IncludeUsableFromInline, "IncludeUsableFromInline"},
+      {NameLookupFlags::ExcludeMacroExpansions, "ExcludeMacroExpansions"},
+      {NameLookupFlags::IgnoreMissingImports, "IgnoreMissingImports"},
+  };
+
+  auto flagsToPrint = llvm::make_filter_range(
+      possibleFlags, [&](Flag flag) { return options.contains(flag.first); });
+
+  out << "{ ";
+  interleave(
+      flagsToPrint, [&](Flag flag) { out << flag.second; },
+      [&] { out << ", "; });
+  out << " }";
+}
+
 namespace {
   /// Builder that helps construct a lookup result from the raw lookup
   /// data.

lib/Sema/TypeChecker.h

@@ -161,11 +161,15 @@ enum class NameLookupFlags {
   /// Whether to include members that would otherwise be filtered out because
   /// they come from a module that has not been imported.
   IgnoreMissingImports = 1 << 4,
+
+  // Reminder: If you add a flag, make sure you update simple_display() below
 };
 
 /// A set of options that control name lookup.
 using NameLookupOptions = OptionSet<NameLookupFlags>;
 
+void simple_display(llvm::raw_ostream &out, NameLookupOptions opts);
+
 inline NameLookupOptions operator|(NameLookupFlags flag1,
                                    NameLookupFlags flag2) {
   return NameLookupOptions(flag1) | flag2;