<div dir="ltr">Oh sorry, I thought you've already committed a fix.<br>You can try to commit and see if this bot's happy afterwards.</div><br><div class="gmail_quote">вт, 7 апр. 2015 г. в 20:37, Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com">timurrrr@google.com</a>>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><a href="http://lab.llvm.org:8011/builders/sanitizer-windows/builds/2329" target="_blank">http://lab.llvm.org:8011/builders/sanitizer-windows/builds/2329</a><br>seems to be happy<br></div><br><div class="gmail_quote">вт, 7 апр. 2015 г. в 20:24, Duncan P. N. Exon Smith <<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>>:</div><div class="gmail_quote"><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
> On 2015-Apr-07, at 08:48, Duncan P. N. Exon Smith <<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>> wrote:<br>
><br>
>><br>
>> On 2015-Apr-07, at 04:32, Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com" target="_blank">timurrrr@google.com</a>> wrote:<br>
>><br>
>> MSVC isn't happy with that, I've landed a band-aid fix in r234307.<br>
>> Please take a look!<br>
><br>
> Thanks for this; looks like my bandaid on the LLVM side. Sorry I missed<br>
> the failure -- I went home once I saw that DwarfUnit.cpp was finally<br>
> building and didn't check for the clang build.<br>
><br>
> I'll find a way to clean all this up this morning.<br>
><br>
<br>
I think r234326 is the proper fix. Can someone with access to MSVC apply<br>
the attached reverts on top of and confirm that the build failures don't<br>
reappear?<br>
<br>
<br>
<br>
<br>
>><br>
>> вт, 7 апр. 2015 г. в 7:21, Duncan P. N. Exon Smith <<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>>:<br>
>><br>
>> Author: dexonsmith<br>
>> Date: Mon Apr 6 23:14:45 2015<br>
>> New Revision: 234291<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=234291&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject?rev=234291&view=rev</a><br>
>> Log:<br>
>> DebugInfo: Update for LLVM change in r234290<br>
>><br>
>> The API for `DIArray` changed; use the new one.<br>
>><br>
>> Modified:<br>
>> cfe/trunk/lib/CodeGen/<u></u>CGDebugI<u></u>nfo.cpp<br>
>><br>
>> Modified: cfe/trunk/lib/CodeGen/<u></u>CGDebugI<u></u>nfo.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=234291&r1=234290&r2=234291&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>pr<u></u>oject/cfe/trunk/lib/CodeGen/<u></u>CG<u></u>DebugInfo.cpp?rev=234291&r1=<u></u>23<u></u>4290&r2=234291&view=diff</a><br>
>> ==============================<u></u><u></u>==============================<u></u><u></u>==================<br>
>> --- cfe/trunk/lib/CodeGen/<u></u>CGDebugI<u></u>nfo.cpp (original)<br>
>> +++ cfe/trunk/lib/CodeGen/<u></u>CGDebugI<u></u>nfo.cpp Mon Apr 6 23:14:45 2015<br>
>> @@ -1039,12 +1039,12 @@ llvm::DICompositeType CGDebugInfo::getOr<br>
>> llvm::DITypeArray Args(<br>
>> cast<llvm::MDSubroutineType>(<u></u><u></u>getOrCreateType(QualType(Func, 0), Unit))<br>
>> ->getTypeArray());<br>
>> - assert(Args.getNumElements() && "Invalid number of arguments!");<br>
>> + assert(Args.size() && "Invalid number of arguments!");<br>
>><br>
>> SmallVector<llvm::Metadata *, 16> Elts;<br>
>><br>
>> // First element is always return type. For 'void' functions it is NULL.<br>
>> - Elts.push_back(Args.<u></u>getElement<u></u>(0));<br>
>> + Elts.push_back(Args[0]);<br>
>><br>
>> // "this" pointer is always first argument.<br>
>> const CXXRecordDecl *RD = ThisPtr-><u></u>getPointeeCXXRecordDe<u></u>cl();<br>
>> @@ -1072,8 +1072,8 @@ llvm::DICompositeType CGDebugInfo::getOr<br>
>> }<br>
>><br>
>> // Copy rest of the arguments.<br>
>> - for (unsigned i = 1, e = Args.getNumElements(); i != e; ++i)<br>
>> - Elts.push_back(Args.<u></u>getElement<u></u>(i));<br>
>> + for (unsigned i = 1, e = Args.size(); i != e; ++i)<br>
>> + Elts.push_back(Args[i]);<br>
>><br>
>> llvm::DITypeArray EltTypeArray = DBuilder.getOrCreateTypeArray(<u></u><u></u>Elts);<br>
>><br>
>><br>
>><br>
>> ______________________________<u></u><u></u>_________________<br>
>> cfe-commits mailing list<br>
>> <a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailm<u></u>an/listinfo/cfe-commits</a><br>
><br>
><br>
> ______________________________<u></u><u></u>_________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailm<u></u>an/listinfo/cfe-commits</a><br>
<br>
</blockquote></div></blockquote></div>