[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cfe-commits
Subject:    Re: r242650 - [modules] Don't save uninteresting identifiers, and don't consider identifiers
From:       Reid Kleckner <rnk () google ! com>
Date:       2015-07-20 20:07:38
Message-ID: CACs=tyJQ0AR=95Fgj1FqD=-bkoJgGPU0LeigEL-Da-6sYjea6g () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


On Sun, Jul 19, 2015 at 2:41 PM, Richard Smith <richard-llvm@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.

[Attachment #5 (text/html)]

<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sun, Jul 19, 2015 \
at 2:41 PM, Richard Smith <span dir="ltr">&lt;<a \
href="mailto:richard-llvm@metafoo.co.uk" \
target="_blank">richard-llvm@metafoo.co.uk</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">@@ -794,8 +795,15 @@ IdentifierInfo \
*ASTIdentifierLookupTrait<br>  // Set or check the various bits in the IdentifierInfo \
structure.<br>  // Token IDs are read-only.<br>
     if (HasRevertedTokenIDToIdentifier &amp;&amp; II-&gt;getTokenID() != \
                tok::identifier)<br>
-      II-&gt;RevertTokenIDToIdentifier();<br>
-   II-&gt;setObjCOrBuiltinID(ObjCOrBuiltinID);<br>
+      II-&gt;revertTokenIDToIdentifier();<br>
+   if (!F.isModule())<br>
+      II-&gt;setObjCOrBuiltinID(ObjCOrBuiltinID);<br>
+   else if (HasRevertedBuiltin &amp;&amp; II-&gt;getBuiltinID()) {<br>
+      II-&gt;revertBuiltin();<br>
+      assert((II-&gt;hasRevertedBuiltin() ||<br>
+                  II-&gt;getObjCOrBuiltinID() == ObjCOrBuiltinID) &amp;&amp;<br>
+                 &quot;Incorrect ObjC keyword or builtin ID&quot;);<br>
+   }<br>
     assert(II-&gt;isExtensionToken() == ExtensionToken &amp;&amp;<br>
               &quot;Incorrect extension token flag&quot;);<br>
     (void)ExtensionToken;<br></blockquote><div><br></div><div>This assert is \
tripping for me locally on Windows.  </div></div></div></div>



_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits


[prev in list] [next in list] [prev in thread] [next in thread]