Merge pull request #78280 from swiftlang/revert-77140-swift-lexical-lookup-validation

Revert "[SwiftLexicalLookup] New unqualified lookup implementation validation"

include/swift/AST/ASTBridging.h

@@ -101,21 +101,6 @@ struct BridgedLocatedIdentifier {
   BridgedSourceLoc NameLoc;
 };
 
-struct BridgedConsumedLookupResult {
-  SWIFT_NAME("name")
-  BridgedIdentifier Name;
-
-  SWIFT_NAME("nameLoc")
-  BridgedSourceLoc NameLoc;
-
-  SWIFT_NAME("flag")
-  SwiftInt Flag;
-
-  BRIDGED_INLINE BridgedConsumedLookupResult(swift::Identifier name,
-                                             swift::SourceLoc sourceLoc,
-                                             SwiftInt flag);
-};
-
 class BridgedDeclBaseName {
   BridgedIdentifier Ident;
 

include/swift/AST/ASTBridgingImpl.h

@@ -55,15 +55,6 @@ swift::DeclBaseName BridgedDeclBaseName::unbridged() const {
   return swift::DeclBaseName(Ident.unbridged());
 }
 
-//===----------------------------------------------------------------------===//
-// MARK: BridgedDeclBaseName
-//===----------------------------------------------------------------------===//
-
-BridgedConsumedLookupResult::BridgedConsumedLookupResult(
-    swift::Identifier name, swift::SourceLoc sourceLoc, SwiftInt flag)
-    : Name(BridgedIdentifier(name)), NameLoc(BridgedSourceLoc(sourceLoc)),
-      Flag(flag) {}
-
 //===----------------------------------------------------------------------===//
 // MARK: BridgedDeclNameRef
 //===----------------------------------------------------------------------===//

include/swift/AST/DiagnosticsCommon.def

@@ -236,13 +236,6 @@ NOTE(in_macro_expansion,none,
 ERROR(macro_experimental,none,
       "%0 macros are an experimental feature that is not enabled %select{|(%1)}1",
       (StringRef, StringRef))
-      
-//------------------------------------------------------------------------------
-// MARK: lexical lookup diagnostics
-//------------------------------------------------------------------------------
-      
-ERROR(lookup_outputs_dont_match,none,
-"Unqualified lookup output from ASTScope and SwiftLexicalLookup don't match", ())
 
 //------------------------------------------------------------------------------
 // MARK: bridged diagnostics

include/swift/Basic/Features.def

@@ -301,10 +301,6 @@ EXPERIMENTAL_FEATURE(ParserRoundTrip, false)
 /// Swift parser.
 EXPERIMENTAL_FEATURE(ParserValidation, false)
 
-/// Whether to perform validation of the unqualified lookup produced by
-/// ASTScope and SwiftLexicalLookup
-EXPERIMENTAL_FEATURE(UnqualifiedLookupValidation, false)
-
 /// Enables implicit some while also enabling existential `any`
 EXPERIMENTAL_FEATURE(ImplicitSome, false)
 

include/swift/Bridging/ASTGen.h

@@ -98,13 +98,6 @@ intptr_t swift_ASTGen_configuredRegions(
 void swift_ASTGen_freeConfiguredRegions(
     BridgedIfConfigClauseRangeInfo *_Nullable regions, intptr_t numRegions);
 
-bool swift_ASTGen_validateUnqualifiedLookup(
-    void *_Nonnull sourceFile,
-    BridgedASTContext astContext,
-    BridgedSourceLoc sourceLoc,
-    bool finishInSequentialScope,
-    BridgedArrayRef astScopeResultRef);
-
 size_t
 swift_ASTGen_virtualFiles(void *_Nonnull sourceFile,
                           BridgedVirtualFile *_Nullable *_Nonnull virtualFiles);