r242650 - [modules] Don't save uninteresting identifiers, and don't consider identifiers

[Reid Kleckner]

On Sun, Jul 19, 2015 at 2:41 PM, Richard Smith <richard-llvm at metafoo.co.uk>
wrote:

> @@ -794,8 +795,15 @@ IdentifierInfo *ASTIdentifierLookupTrait
>    // Set or check the various bits in the IdentifierInfo structure.
>    // Token IDs are read-only.
>    if (HasRevertedTokenIDToIdentifier && II->getTokenID() !=
> tok::identifier)
> -    II->RevertTokenIDToIdentifier();
> -  II->setObjCOrBuiltinID(ObjCOrBuiltinID);
> +    II->revertTokenIDToIdentifier();
> +  if (!F.isModule())
> +    II->setObjCOrBuiltinID(ObjCOrBuiltinID);
> +  else if (HasRevertedBuiltin && II->getBuiltinID()) {
> +    II->revertBuiltin();
> +    assert((II->hasRevertedBuiltin() ||
> +            II->getObjCOrBuiltinID() == ObjCOrBuiltinID) &&
> +           "Incorrect ObjC keyword or builtin ID");
> +  }
>    assert(II->isExtensionToken() == ExtensionToken &&
>           "Incorrect extension token flag");
>    (void)ExtensionToken;
>

This assert is tripping for me locally on Windows.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150720/e30ff5b9/attachment.html>