---

yaml
---
r: 349397
b: refs/heads/master-next
c: 0db092c
h: refs/heads/master
i:
  349395: 50c0796

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: c063e94412f6fd2a383d24144863fac3696a65d2
+refs/heads/master-next: 0db092c46cf16a6c1983494ece86727f7187a12c
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/ClangImporter/DWARFImporter.cpp

@@ -138,9 +138,9 @@ void ClangImporter::Implementation::lookupValueDWARF(
     return;
 
   SmallVector<clang::Decl *, 4> decls;
-  DWARFImporter->lookupValue(name.getBaseIdentifier().str(), llvm::None, decls);
+  DWARFImporter->lookupValue(name.getBaseIdentifier().str(), None, decls);
   for (auto *clangDecl : decls) {
-    auto *namedDecl = dyn_cast_or_null<clang::NamedDecl>(clangDecl);
+    auto *namedDecl = dyn_cast<clang::NamedDecl>(clangDecl);
     if (!namedDecl)
       continue;
     auto *swiftDecl = cast_or_null<ValueDecl>(
@@ -168,9 +168,7 @@ void ClangImporter::Implementation::lookupTypeDeclDWARF(
         !isa<clang::ObjCCompatibleAliasDecl>(clangDecl)) {
       continue;
     }
-    auto *namedDecl = dyn_cast_or_null<clang::NamedDecl>(clangDecl);
-    if (!namedDecl)
-      continue;
+    auto *namedDecl = cast<clang::NamedDecl>(clangDecl);
     Decl *importedDecl = cast_or_null<ValueDecl>(
         importDeclReal(namedDecl->getMostRecentDecl(), CurrentVersion));