diff --git a/lib/IR/DebugInfo.cpp b/lib/IR/DebugInfo.cpp
index 59d1511cc26..70025c77518 100644
--- a/lib/IR/DebugInfo.cpp
+++ b/lib/IR/DebugInfo.cpp
@@ -381,13 +381,15 @@ StringRef DIScope::getName() const {
 
 StringRef DIScope::getFilename() const {
   if (auto *N = get())
-    return ::getStringField(dyn_cast_or_null<MDNode>(N->getFile()), 0);
+    if (auto *F = N->getFile())
+      return F->getFilename();
   return "";
 }
 
 StringRef DIScope::getDirectory() const {
   if (auto *N = get())
-    return ::getStringField(dyn_cast_or_null<MDNode>(N->getFile()), 1);
+    if (auto *F = N->getFile())
+      return F->getDirectory();
   return "";
 }