On W= ed, Jul 29, 2015 at 5:35 PM, Richard Smith <richard@metafoo.co.uk&= gt; wrote:

On Wed, Ju= l 29, 2015 at 10:43 AM, Sean Callanan <scallanan@apple.com> wrote:
LLDB=E2=80=99s module support (implemented here:=C2=A0http://llvm.o= rg/svn/llvm-project/lldb/trunk/source/Expression/ClangModulesDeclVendor.cpp= ) sets up its own CompilerInstance and then loads modules into it.
=
The way we import macros from modules into expressions is by= textual inclusion =E2=80=93 we iterate across the macros like this:
<= div>
=E2=80=93
if (m_compiler= _instance->getPreprocessor().getExternalSource())
{
=C2=A0=C2=A0m_compiler_instance-><= /span>getPreprocessor().getExternalSource()->ReadDefined= Macros();
<= /div>

FYI, this is redundant; macro_begin does this for you.

=C2=A0

}

for (clang::Preprocessor::macro_iterator mi =3D m_compiler_instance-><= /span>getPreprocessor().macro_begin(),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0me =3D m_compiler_instance->getPrep= rocessor().macro_end();
=C2=A0 =C2=A0 =C2=A0mi !=3D me; ++mi)
{
=C2=A0=C2=A0// ...
=C2=A0=C2= =A0clang::Mac= roInfo *macro_info = =3D nullptr;
=C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0
=C2= =A0=C2=A0for (clang::ModuleMacro *modul= e_macro : m_compiler_instance->getPreprocessor().getLeafModuleMacros(ii))
=C2=A0 {
=C2=A0 =C2= =A0=C2=A0// pick the macro_info from the= module we care most about; that might be NULL
=C2=A0 }
=C2=A0=C2=A0 =C2=A0 =C2=A0 =C2=A0
=C2=A0=C2=A0<= span style=3D"color:#bb2ca2">if (macro_info)
=C2=A0 {
<= div style=3D"margin:0px;font-size:11px;line-height:normal;font-family:Menlo= ">=C2=A0 =C2=A0=C2=A0// make a string fr= om the macro
=C2=A0 }
}
=E2=80=93

What Im= noticing is that a macro (say, =E2=80=9CMAX=E2=80=9D) doesn=E2=80=99t appe= ar in the=C2=A0macro_begin()=C2=A0list at all.=C2=A0 Only later, after I=E2=80=99ve done a na= me lookup for =E2=80=9CMAX" (on the assumption that it might be a vari= able, see=C2=A0ClangModulesDeclVendorImpl::FindDecls()), does it appear in the list.

= Is there something else I need to tickle here, or is this a bug in the API?=

Does this help:

Index: lib/Serialization/ASTReader.cpp

=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--- lib/Serializ= ation/ASTReader.cpp =C2=A0 =C2=A0 (revision 243368)

+++ lib/Seria= lization/ASTReader.cpp =C2=A0 =C2=A0 (working copy)

@@ -1623,7 +1= 623,7 @@

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case PP= _MACRO_OBJECT_LIKE:

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case PP_MAC= RO_FUNCTION_LIKE:

- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0getLocalIde= ntifier(**I, Record[0]);

+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0upda= teOutOfDateIdentifier(*getLocalIdentifier(**I, Record[0]));

=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;

=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case PP_TOKEN: