diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
--- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
@@ -945,11 +945,11 @@
     llvm::Optional<uint16_t> modi = m_index->GetModuleIndexForVa(file_addr);
     if (!modi)
       return 0;
-    CompilandIndexItem *cci = m_index->compilands().GetCompiland(*modi);
-    if (!cci)
+    CompUnitSP cu_sp = GetCompileUnitAtIndex(modi.getValue());
+    if (!cu_sp)
       return 0;
 
-    sc.comp_unit = GetOrCreateCompileUnit(*cci).get();
+    sc.comp_unit = cu_sp.get();
     resolved_flags |= eSymbolContextCompUnit;
   }
 
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/lookup-by-address.cpp b/lldb/test/Shell/SymbolFile/NativePDB/lookup-by-address.cpp
new file mode 100644
--- /dev/null
+++ b/lldb/test/Shell/SymbolFile/NativePDB/lookup-by-address.cpp
@@ -0,0 +1,20 @@
+// clang-format off
+// REQUIRES: lld, x86
+
+// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -GR- -c /Fo%t.obj -- %s
+// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
+// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -O "target create %t.exe" -o "image lookup -n main" -o "exit" > %t.out
+// RUN: FileCheck --input-file=%t.out %s --check-prefix=NAME
+// RUN: address=`grep "Address:" %t.out | sed "s/.*Address: lookup-by-address.cpp.tmp.exe\[\(.*\)\].*/\1/"`
+// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -O "target create %t.exe" -o "image lookup -a $address" -o "exit" | FileCheck %s --check-prefix=ADDRESS
+int main(int argc, char **argv) {
+  return 0;
+}
+
+// NAME: image lookup -n main
+// NAME: Address: lookup-by-address.cpp.tmp.exe[{{.*}}] (lookup-by-address.cpp.tmp.exe..text
+// NAME: Summary: lookup-by-address.cpp.tmp.exe`main at lookup-by-address.cpp:10
+
+// ADDRESS: image lookup -a {{.*}}
+// ADDRESS: Address: lookup-by-address.cpp.tmp.exe[{{.*}}] (lookup-by-address.cpp.tmp.exe..text
+// ADDRESS: Summary: lookup-by-address.cpp.tmp.exe`main at lookup-by-address.cpp:10