Merge pull request #74788 from hamishknight/null-context-6.0

[6.0] [ClangImporter] Switch `lookupGlobalsAsMembers` to take a non-optional EffectiveClangContext

Author: hamishknight

lib/ClangImporter/SwiftLookupTable.cpp

@@ -684,14 +684,13 @@ SwiftLookupTable::allGlobalsAsMembersInContext(StoredContext context) {
 }
 
 SmallVector<SwiftLookupTable::SingleEntry, 4>
-SwiftLookupTable::lookupGlobalsAsMembers(
-    SerializedSwiftName baseName,
-    std::optional<EffectiveClangContext> searchContext) {
+SwiftLookupTable::lookupGlobalsAsMembers(SerializedSwiftName baseName,
+                                         EffectiveClangContext searchContext) {
   // Propagate the null search context.
   if (!searchContext)
     return lookupGlobalsAsMembersImpl(baseName, std::nullopt);
 
-  std::optional<StoredContext> storedContext = translateContext(*searchContext);
+  std::optional<StoredContext> storedContext = translateContext(searchContext);
   if (!storedContext) return { };
 
   return lookupGlobalsAsMembersImpl(baseName, *storedContext);

lib/ClangImporter/SwiftLookupTable.h

@@ -549,7 +549,7 @@ class SwiftLookupTable {
   /// entities should reside.
   SmallVector<SingleEntry, 4>
   lookupGlobalsAsMembers(SerializedSwiftName baseName,
-                         std::optional<EffectiveClangContext> searchContext);
+                         EffectiveClangContext searchContext);
 
   SmallVector<SingleEntry, 4>
   allGlobalsAsMembersInContext(EffectiveClangContext context);