[TBD] [Immediate] Revert implementation of SymbolSourceMap

Author: Zak Kent

include/swift/AST/TBDGenRequests.h

@@ -209,19 +209,27 @@ class SymbolSourceMap {
   friend class SymbolSourceMapRequest;
 
   using Storage = llvm::StringMap<SymbolSource>;
+  const Storage *storage;
 
-  explicit SymbolSourceMap(Storage *storage) : storage(storage) {
+  explicit SymbolSourceMap(const Storage *storage) : storage(storage) {
     assert(storage);
   }
 
 public:
-  Storage *storage;
   llvm::Optional<SymbolSource> find(StringRef symbol) const {
     auto result = storage->find(symbol);
     if (result == storage->end())
       return llvm::None;
     return result->second;
   }
+  
+  Storage::const_iterator begin() const {
+    return storage->begin();
+  }
+  
+  Storage::const_iterator end() const {
+    return storage->end();
+  }
 
   friend bool operator==(const SymbolSourceMap &lhs,
                          const SymbolSourceMap &rhs) {

lib/Immediate/SwiftMaterializationUnit.cpp

@@ -295,7 +295,7 @@ LazySwiftMaterializationUnit::Create(SwiftJIT &JIT, CompilerInstance &CI) {
   auto Sources =
       llvm::cantFail(M->getASTContext().evaluator(std::move(SourceReq)));
   llvm::orc::SymbolFlagsMap PublicInterface;
-  for (const auto &Entry : *Sources.storage) {
+  for (const auto &Entry : Sources) {
     const auto &Source = Entry.getValue();
     if (Source.kind != SymbolSource::Kind::SIL) {
       continue;
@@ -330,8 +330,9 @@ void LazySwiftMaterializationUnit::materialize(
   const auto &RS = MR->getRequestedSymbols();
   for (auto &Sym : RS) {
     auto Name = demangle(*Sym);
-    const auto &Source = Sources.storage->find(Name)->getValue();
-    auto Ref = Source.getSILDeclRef();
+    auto Source = Sources.find(Name);
+    assert(Source && "Requested symbol doesn't have source?");
+    auto Ref = Source->getSILDeclRef();
     if (auto *AFD = Ref.getAbstractFunctionDecl()) {
       AFD->getTypecheckedBody();
       if (CI.getASTContext().hadError()) {