[nfc][cxx-interop] Add three requests ClangDirectLookupRequest, CXXNamespaceMemberLookup, and ClangRecordMemberLookup.

include/swift/ClangImporter/ClangImporterRequests.h

@@ -19,8 +19,161 @@
 #include "swift/AST/SimpleRequest.h"
 #include "swift/AST/ASTTypeIDs.h"
 #include "swift/AST/EvaluatorDependencies.h"
+#include "swift/AST/FileUnit.h"
+#include "swift/AST/Identifier.h"
+#include "swift/AST/NameLookup.h"
+#include "swift/Basic/Statistic.h"
+#include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/TinyPtrVector.h"
 
 namespace swift {
+class Decl;
+class DeclName;
+class EnumDecl;
+
+/// The input type for a clang direct lookup request.
+struct ClangDirectLookupDescriptor final {
+  Decl *decl;
+  DeclName name;
+
+  ClangDirectLookupDescriptor(Decl *decl, DeclName name)
+      : decl(decl), name(name) {}
+
+  friend llvm::hash_code hash_value(const ClangDirectLookupDescriptor &desc) {
+    return llvm::hash_combine(desc.name, desc.decl);
+  }
+
+  friend bool operator==(const ClangDirectLookupDescriptor &lhs,
+                         const ClangDirectLookupDescriptor &rhs) {
+    return lhs.name == rhs.name && lhs.decl == rhs.decl;
+  }
+
+  friend bool operator!=(const ClangDirectLookupDescriptor &lhs,
+                         const ClangDirectLookupDescriptor &rhs) {
+    return !(lhs == rhs);
+  }
+};
+
+void simple_display(llvm::raw_ostream &out,
+                    const ClangDirectLookupDescriptor &desc);
+SourceLoc extractNearestSourceLoc(const ClangDirectLookupDescriptor &desc);
+
+/// This matches SwiftLookupTable::SingleEntry;
+using SingleEntry = llvm::PointerUnion<clang::NamedDecl *, clang::MacroInfo *,
+                                       clang::ModuleMacro *>;
+/// Uses the appropriate SwiftLookupTable to find a set of clang decls given
+/// their name.
+class ClangDirectLookupRequest
+    : public SimpleRequest<ClangDirectLookupRequest,
+                           SmallVector<SingleEntry, 4>(
+                               ClangDirectLookupDescriptor),
+                           RequestFlags::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  SmallVector<SingleEntry, 4> evaluate(Evaluator &evaluator,
+                                       ClangDirectLookupDescriptor desc) const;
+};
+
+/// The input type for a namespace member lookup request.
+struct CXXNamespaceMemberLookupDescriptor final {
+  EnumDecl *namespaceDecl;
+  DeclName name;
+
+  CXXNamespaceMemberLookupDescriptor(EnumDecl *namespaceDecl, DeclName name)
+      : namespaceDecl(namespaceDecl), name(name) {
+    assert(isa<clang::NamespaceDecl>(namespaceDecl->getClangDecl()));
+  }
+
+  friend llvm::hash_code
+  hash_value(const CXXNamespaceMemberLookupDescriptor &desc) {
+    return llvm::hash_combine(desc.name, desc.namespaceDecl);
+  }
+
+  friend bool operator==(const CXXNamespaceMemberLookupDescriptor &lhs,
+                         const CXXNamespaceMemberLookupDescriptor &rhs) {
+    return lhs.name == rhs.name && lhs.namespaceDecl == rhs.namespaceDecl;
+  }
+
+  friend bool operator!=(const CXXNamespaceMemberLookupDescriptor &lhs,
+                         const CXXNamespaceMemberLookupDescriptor &rhs) {
+    return !(lhs == rhs);
+  }
+};
+
+void simple_display(llvm::raw_ostream &out,
+                    const CXXNamespaceMemberLookupDescriptor &desc);
+SourceLoc
+extractNearestSourceLoc(const CXXNamespaceMemberLookupDescriptor &desc);
+
+/// Uses ClangDirectLookup to find a named member inside of the given namespace.
+class CXXNamespaceMemberLookup
+    : public SimpleRequest<CXXNamespaceMemberLookup,
+                           TinyPtrVector<ValueDecl *>(
+                               CXXNamespaceMemberLookupDescriptor),
+                           RequestFlags::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  TinyPtrVector<ValueDecl *>
+  evaluate(Evaluator &evaluator, CXXNamespaceMemberLookupDescriptor desc) const;
+};
+
+/// The input type for a record member lookup request.
+struct ClangRecordMemberLookupDescriptor final {
+  StructDecl *recordDecl;
+  DeclName name;
+
+  ClangRecordMemberLookupDescriptor(StructDecl *recordDecl, DeclName name)
+      : recordDecl(recordDecl), name(name) {
+    assert(isa<clang::RecordDecl>(recordDecl->getClangDecl()));
+  }
+
+  friend llvm::hash_code
+  hash_value(const ClangRecordMemberLookupDescriptor &desc) {
+    return llvm::hash_combine(desc.name, desc.recordDecl);
+  }
+
+  friend bool operator==(const ClangRecordMemberLookupDescriptor &lhs,
+                         const ClangRecordMemberLookupDescriptor &rhs) {
+    return lhs.name == rhs.name && lhs.recordDecl == rhs.recordDecl;
+  }
+
+  friend bool operator!=(const ClangRecordMemberLookupDescriptor &lhs,
+                         const ClangRecordMemberLookupDescriptor &rhs) {
+    return !(lhs == rhs);
+  }
+};
+
+void simple_display(llvm::raw_ostream &out,
+                    const ClangRecordMemberLookupDescriptor &desc);
+SourceLoc
+extractNearestSourceLoc(const ClangRecordMemberLookupDescriptor &desc);
+
+/// Uses ClangDirectLookup to find a named member inside of the given record.
+class ClangRecordMemberLookup
+    : public SimpleRequest<ClangRecordMemberLookup,
+                           TinyPtrVector<ValueDecl *>(
+                               ClangRecordMemberLookupDescriptor),
+                           RequestFlags::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  TinyPtrVector<ValueDecl *>
+  evaluate(Evaluator &evaluator, ClangRecordMemberLookupDescriptor desc) const;
+};
 
 #define SWIFT_TYPEID_ZONE ClangImporter
 #define SWIFT_TYPEID_HEADER "swift/ClangImporter/ClangImporterTypeIDZone.def"

include/swift/ClangImporter/ClangImporterTypeIDZone.def

@@ -15,3 +15,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+SWIFT_REQUEST(ClangImporter, ClangDirectLookupRequest,
+              (SmallVector<SingleEntry, 4>(ClangDirectLookupDescriptor)), Uncached,
+              NoLocationInfo)
+SWIFT_REQUEST(ClangImporter, CXXNamespaceMemberLookup,
+              Decl *(CXXNamespaceMemberLookupDescriptor), Uncached,
+              NoLocationInfo)
+SWIFT_REQUEST(ClangImporter, ClangRecordMemberLookup,
+              Decl *(ClangRecordMemberLookupDescriptor), Uncached,
+              NoLocationInfo)

lib/AST/NameLookupRequests.cpp

@@ -412,6 +412,68 @@ void UnqualifiedLookupRequest::writeDependencySink(
   track.addTopLevelName(desc.Name.getBaseName());
 }
 
+// The following clang importer requests have some definitions here to prevent
+// linker errors when building lib syntax parser (which doesn't link with the
+// clang importer).
+
+//----------------------------------------------------------------------------//
+// ClangDirectLookupRequest computation.
+//----------------------------------------------------------------------------//
+
+void swift::simple_display(llvm::raw_ostream &out,
+                           const ClangDirectLookupDescriptor &desc) {
+  out << "Looking up ";
+  simple_display(out, desc.name);
+  out << " in ";
+  simple_display(out, desc.decl);
+}
+
+SourceLoc
+swift::extractNearestSourceLoc(const ClangDirectLookupDescriptor &desc) {
+  return extractNearestSourceLoc(desc.decl);
+}
+
+//----------------------------------------------------------------------------//
+// CXXNamespaceMemberLookup computation.
+//----------------------------------------------------------------------------//
+
+void swift::simple_display(llvm::raw_ostream &out,
+                           const CXXNamespaceMemberLookupDescriptor &desc) {
+  out << "Looking up ";
+  simple_display(out, desc.name);
+  out << " in ";
+  simple_display(out, desc.namespaceDecl);
+}
+
+SourceLoc
+swift::extractNearestSourceLoc(const CXXNamespaceMemberLookupDescriptor &desc) {
+  return extractNearestSourceLoc(desc.namespaceDecl);
+}
+
+//----------------------------------------------------------------------------//
+// ClangRecordMemberLookup computation.
+//----------------------------------------------------------------------------//
+
+void swift::simple_display(llvm::raw_ostream &out,
+                           const ClangRecordMemberLookupDescriptor &desc) {
+  out << "Looking up ";
+  simple_display(out, desc.name);
+  out << " in ";
+  simple_display(out, desc.recordDecl);
+}
+
+SourceLoc
+swift::extractNearestSourceLoc(const ClangRecordMemberLookupDescriptor &desc) {
+  return extractNearestSourceLoc(desc.recordDecl);
+}
+
+// Implement the clang importer type zone.
+#define SWIFT_TYPEID_ZONE ClangImporter
+#define SWIFT_TYPEID_HEADER "swift/ClangImporter/ClangImporterTypeIDZone.def"
+#include "swift/Basic/ImplementTypeIDZone.h"
+#undef SWIFT_TYPEID_ZONE
+#undef SWIFT_TYPEID_HEADER
+
 // Define request evaluation functions for each of the name lookup requests.
 static AbstractRequestFunction *nameLookupRequestFunctions[] = {
 #define SWIFT_REQUEST(Zone, Name, Sig, Caching, LocOptions)                    \