diff --git a/lldb/source/Expression/ClangModulesDeclVendor.cpp b/lldb/source/Expression/ClangModulesDeclVendor.cpp
index b4dd73b6e2f1..9269bec7b5f3 100644
--- a/lldb/source/Expression/ClangModulesDeclVendor.cpp
+++ b/lldb/source/Expression/ClangModulesDeclVendor.cpp
@@ -486,12 +486,12 @@ ClangModulesDeclVendorImpl::ForEachMacro(const ClangModulesDeclVendor::ModuleVec
             continue;
         }
         
-        if (mi->second->getKind() == clang::MacroDirective::MD_Define)
+        if (mi->second.getLatest()->getKind() == clang::MacroDirective::MD_Define)
         {            
             std::string macro_expansion = "#define ";
             macro_expansion.append(mi->first->getName().str().c_str());
                 
-            if (clang::MacroInfo *macro_info = mi->second->getMacroInfo())
+            if (clang::MacroInfo *macro_info = mi->second.getLatest()->getMacroInfo())
             {
                 if (macro_info->isFunctionLike())
                 {