---

yaml
---
r: 348532
b: refs/heads/master
c: 57bf724
h: refs/heads/master

Author: lanza

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fd51631a6fc2e8cd413984d3c5cec8ac9143e81a
+refs/heads/master: 57bf724b1ea478f68ce7199a5ec9884ebc1eeb96
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/ClangImporter/ClangImporter.cpp

@@ -1173,17 +1173,18 @@ ClangImporter::create(ASTContext &ctx, const ClangImporterOptions &importerOpts,
 bool ClangImporter::addSearchPath(StringRef newSearchPath, bool isFramework,
                                   bool isSystem) {
   clang::FileManager &fileMgr = Impl.Instance->getFileManager();
-  auto entry = fileMgr.getDirectory(newSearchPath);
-  if (!entry)
+  auto optionalEntry = fileMgr.getOptionalDirectoryRef(newSearchPath);
+  if (!optionalEntry)
     return true;
+  auto entry = *optionalEntry;
 
   auto &headerSearchInfo = Impl.getClangPreprocessor().getHeaderSearchInfo();
   auto exists = std::any_of(headerSearchInfo.search_dir_begin(),
                             headerSearchInfo.search_dir_end(),
                             [&](const clang::DirectoryLookup &lookup) -> bool {
     if (isFramework)
-      return lookup.getFrameworkDir() == *entry;
-    return lookup.getDir() == *entry;
+      return lookup.getFrameworkDir() == &entry.getDirEntry();
+    return lookup.getDir() == &entry.getDirEntry();
   });
   if (exists) {
     // Don't bother adding a search path that's already there. Clang would have
@@ -1192,7 +1193,7 @@ bool ClangImporter::addSearchPath(StringRef newSearchPath, bool isFramework,
   }
 
   auto kind = isSystem ? clang::SrcMgr::C_System : clang::SrcMgr::C_User;
-  headerSearchInfo.AddSearchPath({*entry, kind, isFramework},
+  headerSearchInfo.AddSearchPath({entry, kind, isFramework},
                                  /*isAngled=*/true);
 
   // In addition to changing the current preprocessor directly, we still need