<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Ok will do!<div class=""><br class=""></div><div class="">CC: Hans FYI.</div><div class=""><br class=""></div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Jan 27, 2017, at 8:15 AM, Ivan Krasin <<a href="mailto:krasin@google.com" class="">krasin@google.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Hi Mehdi,<div class=""><br class=""></div><div class="">I have never done that (cherry picking into an LLVM release branch) before and probably won't have this need often. I would appreciate if you do it.</div><div class=""><br class=""></div><div class="">Thank you!</div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Fri, Jan 27, 2017 at 8:11 AM, Mehdi Amini <span dir="ltr" class=""><<a href="mailto:mehdi.amini@apple.com" target="_blank" class="">mehdi.amini@apple.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Are you cherry-picking this in clang-4.0 or do you want me to do?<br class="">
<br class="">
(Has been approved by Peter on Phab)<br class="">
<br class="">
—<br class="">
Mehdi<br class="">
<br class="">
> On Jan 27, 2017, at 7:54 AM, Ivan Krasin via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class="">
><br class="">
> Author: krasin<br class="">
> Date: Fri Jan 27 09:54:49 2017<br class="">
> New Revision: 293291<br class="">
><br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=293291&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project?rev=293291&view=rev</a><br class="">
> Log:<br class="">
> Avoid using unspecified ordering in MetadataLoader::<wbr class="">MetadataLoaderImpl::<wbr class="">parseOneMetadata.<br class="">
><br class="">
> Summary:<br class="">
> MetadataLoader::<wbr class="">MetadataLoaderImpl::<wbr class="">parseOneMetadata uses<br class="">
> the following construct in a number of places:<br class="">
><br class="">
> ```<br class="">
> MetadataList.assignValue(<...><wbr class="">, NextMetadataNo++);<br class="">
> ```<br class="">
><br class="">
> There, NextMetadataNo gets incremented, and since the order<br class="">
> of arguments evaluation is not specified, that can happen<br class="">
> before or after other arguments are evaluated.<br class="">
><br class="">
> In a few cases the other arguments indirectly use NextMetadataNo.<br class="">
> For instance, it's<br class="">
><br class="">
> ```<br class="">
> MetadataList.assignValue(<br class="">
>    GET_OR_DISTINCT(DIModule,<br class="">
>                    (Context, getMDOrNull(Record[1]),<br class="">
>                     getMDString(Record[2]), getMDString(Record[3]),<br class="">
>                     getMDString(Record[4]), getMDString(Record[5]))),<br class="">
>    NextMetadataNo++);<br class="">
> ```<br class="">
><br class="">
> getMDOrNull calls getMD that uses NextMetadataNo:<br class="">
><br class="">
> ```<br class="">
> MetadataList.<wbr class="">getMetadataFwdRef(<wbr class="">NextMetadataNo);<br class="">
> ```<br class="">
><br class="">
> Therefore, the order of evaluation becomes important. That caused<br class="">
> a very subtle LLD crash that only happens if compiled with GCC or<br class="">
> if LLD is built with LTO. In the case if LLD is compiled with Clang<br class="">
> and regular linking mode, everything worked as intended.<br class="">
><br class="">
> This change extracts incrementing of NextMetadataNo outside of<br class="">
> the arguments list to guarantee the correct order of evaluation.<br class="">
><br class="">
> For the record, this has taken 3 days to track to the origin. It all<br class="">
> started with a ThinLTO bot in Chrome not being able to link a target<br class="">
> if debug info is enabled.<br class="">
><br class="">
> Reviewers: pcc, mehdi_amini<br class="">
><br class="">
> Reviewed By: mehdi_amini<br class="">
><br class="">
> Subscribers: aprantl, llvm-commits<br class="">
><br class="">
> Differential Revision: <a href="https://reviews.llvm.org/D29204" rel="noreferrer" target="_blank" class="">https://reviews.llvm.org/<wbr class="">D29204</a><br class="">
><br class="">
> Modified:<br class="">
>    llvm/trunk/lib/Bitcode/Reader/<wbr class="">MetadataLoader.cpp<br class="">
><br class="">
> Modified: llvm/trunk/lib/Bitcode/Reader/<wbr class="">MetadataLoader.cpp<br class="">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp?rev=293291&r1=293290&r2=293291&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-<wbr class="">project/llvm/trunk/lib/<wbr class="">Bitcode/Reader/MetadataLoader.<wbr class="">cpp?rev=293291&r1=293290&r2=<wbr class="">293291&view=diff</a><br class="">
> ==============================<wbr class="">==============================<wbr class="">==================<br class="">
> --- llvm/trunk/lib/Bitcode/Reader/<wbr class="">MetadataLoader.cpp (original)<br class="">
> +++ llvm/trunk/lib/Bitcode/Reader/<wbr class="">MetadataLoader.cpp Fri Jan 27 09:54:49 2017<br class="">
> @@ -922,7 +922,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     // If this isn't a LocalAsMetadata record, we're dropping it.  This used<br class="">
>     // to be legal, but there's no upgrade path.<br class="">
>     auto dropRecord = [&] {<br class="">
> -      MetadataList.assignValue(<wbr class="">MDNode::get(Context, None), NextMetadataNo++);<br class="">
> +      MetadataList.assignValue(<wbr class="">MDNode::get(Context, None), NextMetadataNo);<br class="">
> +      NextMetadataNo++;<br class="">
>     };<br class="">
>     if (Record.size() != 2) {<br class="">
>       dropRecord();<br class="">
> @@ -937,7 +938,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
><br class="">
>     MetadataList.assignValue(<br class="">
>         LocalAsMetadata::get(<wbr class="">ValueList.getValueFwdRef(<wbr class="">Record[1], Ty)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_OLD_NODE: {<br class="">
> @@ -962,7 +964,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>       } else<br class="">
>         Elts.push_back(nullptr);<br class="">
>     }<br class="">
> -    MetadataList.assignValue(<wbr class="">MDNode::get(Context, Elts), NextMetadataNo++);<br class="">
> +    MetadataList.assignValue(<wbr class="">MDNode::get(Context, Elts), NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_VALUE: {<br class="">
> @@ -975,7 +978,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
><br class="">
>     MetadataList.assignValue(<br class="">
>         ValueAsMetadata::get(<wbr class="">ValueList.getValueFwdRef(<wbr class="">Record[1], Ty)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_DISTINCT_NODE:<br class="">
> @@ -988,7 +992,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>       Elts.push_back(getMDOrNull(ID)<wbr class="">);<br class="">
>     MetadataList.assignValue(<wbr class="">IsDistinct ? MDNode::getDistinct(Context, Elts)<br class="">
>                                         : MDNode::get(Context, Elts),<br class="">
> -                             NextMetadataNo++);<br class="">
> +                             NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_LOCATION: {<br class="">
> @@ -1002,7 +1007,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     Metadata *InlinedAt = getMDOrNull(Record[4]);<br class="">
>     MetadataList.assignValue(<br class="">
>         GET_OR_DISTINCT(DILocation, (Context, Line, Column, Scope, InlinedAt)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_GENERIC_DEBUG: {<br class="">
> @@ -1022,7 +1028,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>       DwarfOps.push_back(<wbr class="">getMDOrNull(Record[I]));<br class="">
>     MetadataList.assignValue(<br class="">
>         GET_OR_DISTINCT(GenericDINode, (Context, Tag, Header, DwarfOps)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_SUBRANGE: {<br class="">
> @@ -1033,7 +1040,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     MetadataList.assignValue(<br class="">
>         GET_OR_DISTINCT(DISubrange,<br class="">
>                         (Context, Record[1], unrotateSign(Record[2]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_ENUMERATOR: {<br class="">
> @@ -1044,7 +1052,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     MetadataList.assignValue(<br class="">
>         GET_OR_DISTINCT(DIEnumerator, (Context, unrotateSign(Record[1]),<br class="">
>                                        getMDString(Record[2]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_BASIC_TYPE: {<br class="">
> @@ -1056,7 +1065,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>         GET_OR_DISTINCT(DIBasicType,<br class="">
>                         (Context, Record[1], getMDString(Record[2]), Record[3],<br class="">
>                          Record[4], Record[5])),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_DERIVED_TYPE: {<br class="">
> @@ -1072,7 +1082,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                          getDITypeRefOrNull(Record[5]),<br class="">
>                          getDITypeRefOrNull(Record[6]), Record[7], Record[8],<br class="">
>                          Record[9], Flags, getDITypeRefOrNull(Record[11])<wbr class="">)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_COMPOSITE_TYPE: {<br class="">
> @@ -1137,7 +1148,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     if (!IsNotUsedInTypeRef && Identifier)<br class="">
>       MetadataList.addTypeRef(*<wbr class="">Identifier, *cast<DICompositeType>(CT));<br class="">
><br class="">
> -    MetadataList.assignValue(CT, NextMetadataNo++);<br class="">
> +    MetadataList.assignValue(CT, NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_SUBROUTINE_<wbr class="">TYPE: {<br class="">
> @@ -1154,7 +1166,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
><br class="">
>     MetadataList.assignValue(<br class="">
>         GET_OR_DISTINCT(<wbr class="">DISubroutineType, (Context, Flags, CC, Types)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
><br class="">
> @@ -1168,7 +1181,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                         (Context, getMDOrNull(Record[1]),<br class="">
>                          getMDString(Record[2]), getMDString(Record[3]),<br class="">
>                          getMDString(Record[4]), getMDString(Record[5]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
><br class="">
> @@ -1184,7 +1198,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>              Record.size() == 3 ? DIFile::CSK_None<br class="">
>                                 : static_cast<DIFile::<wbr class="">ChecksumKind>(Record[3]),<br class="">
>              Record.size() == 3 ? nullptr : getMDString(Record[4]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_COMPILE_UNIT: {<br class="">
> @@ -1203,7 +1218,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>         Record.size() <= 14 ? 0 : Record[14],<br class="">
>         Record.size() <= 16 ? true : Record[16]);<br class="">
><br class="">
> -    MetadataList.assignValue(CU, NextMetadataNo++);<br class="">
> +    MetadataList.assignValue(CU, NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
><br class="">
>     // Move the Upgrade the list of subprograms.<br class="">
>     if (Metadata *SPs = getMDOrNullWithoutPlaceholders<wbr class="">(Record[11]))<br class="">
> @@ -1250,7 +1266,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                        getMDOrNull(Record[16 + Offset]), // declaration<br class="">
>                        getMDOrNull(Record[17 + Offset])  // variables<br class="">
>                        ));<br class="">
> -    MetadataList.assignValue(SP, NextMetadataNo++);<br class="">
> +    MetadataList.assignValue(SP, NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
><br class="">
>     // Upgrade sp->function mapping to function->sp mapping.<br class="">
>     if (HasFn) {<br class="">
> @@ -1275,7 +1292,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>         GET_OR_DISTINCT(<wbr class="">DILexicalBlock,<br class="">
>                         (Context, getMDOrNull(Record[1]),<br class="">
>                          getMDOrNull(Record[2]), Record[3], Record[4])),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_LEXICAL_BLOCK_<wbr class="">FILE: {<br class="">
> @@ -1287,7 +1305,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>         GET_OR_DISTINCT(<wbr class="">DILexicalBlockFile,<br class="">
>                         (Context, getMDOrNull(Record[1]),<br class="">
>                          getMDOrNull(Record[2]), Record[3])),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_NAMESPACE: {<br class="">
> @@ -1301,7 +1320,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                         (Context, getMDOrNull(Record[1]),<br class="">
>                          getMDOrNull(Record[2]), getMDString(Record[3]),<br class="">
>                          Record[4], ExportSymbols)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_MACRO: {<br class="">
> @@ -1313,7 +1333,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>         GET_OR_DISTINCT(DIMacro,<br class="">
>                         (Context, Record[1], Record[2], getMDString(Record[3]),<br class="">
>                          getMDString(Record[4]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_MACRO_FILE: {<br class="">
> @@ -1325,7 +1346,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>         GET_OR_DISTINCT(DIMacroFile,<br class="">
>                         (Context, Record[1], Record[2], getMDOrNull(Record[3]),<br class="">
>                          getMDOrNull(Record[4]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_TEMPLATE_TYPE: {<br class="">
> @@ -1336,7 +1358,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     MetadataList.assignValue(GET_<wbr class="">OR_DISTINCT(<wbr class="">DITemplateTypeParameter,<br class="">
>                                              (Context, getMDString(Record[1]),<br class="">
>                                               getDITypeRefOrNull(Record[2]))<wbr class="">),<br class="">
> -                             NextMetadataNo++);<br class="">
> +                             NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_TEMPLATE_VALUE: {<br class="">
> @@ -1349,7 +1372,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                         (Context, Record[1], getMDString(Record[2]),<br class="">
>                          getDITypeRefOrNull(Record[3]),<br class="">
>                          getMDOrNull(Record[4]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_GLOBAL_VAR: {<br class="">
> @@ -1367,7 +1391,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                            getMDOrNull(Record[4]), Record[5],<br class="">
>                            getDITypeRefOrNull(Record[6]), Record[7], Record[8],<br class="">
>                            getMDOrNull(Record[10]), Record[11])),<br class="">
> -          NextMetadataNo++);<br class="">
> +          NextMetadataNo);<br class="">
> +      NextMetadataNo++;<br class="">
>     } else if (Version == 0) {<br class="">
>       // Upgrade old metadata, which stored a global variable reference or a<br class="">
>       // ConstantInt here.<br class="">
> @@ -1399,7 +1424,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>            getMDOrNull(Record[10]), AlignInBits));<br class="">
><br class="">
>       auto *DGVE = DIGlobalVariableExpression::<wbr class="">getDistinct(Context, DGV, Expr);<br class="">
> -      MetadataList.assignValue(DGVE, NextMetadataNo++);<br class="">
> +      MetadataList.assignValue(DGVE, NextMetadataNo);<br class="">
> +      NextMetadataNo++;<br class="">
>       if (Attach)<br class="">
>         Attach->addDebugInfo(DGVE);<br class="">
>     } else<br class="">
> @@ -1432,7 +1458,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                          getMDOrNull(Record[3 + HasTag]), Record[4 + HasTag],<br class="">
>                          getDITypeRefOrNull(Record[5 + HasTag]),<br class="">
>                          Record[6 + HasTag], Flags, AlignInBits)),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_EXPRESSION: {<br class="">
> @@ -1449,7 +1476,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
><br class="">
>     MetadataList.assignValue(<br class="">
>         GET_OR_DISTINCT(DIExpression, (Context, makeArrayRef(Record).slice(1))<wbr class="">),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_GLOBAL_VAR_<wbr class="">EXPR: {<br class="">
> @@ -1460,7 +1488,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     MetadataList.assignValue(GET_<wbr class="">OR_DISTINCT(<wbr class="">DIGlobalVariableExpression,<br class="">
>                                              (Context, getMDOrNull(Record[1]),<br class="">
>                                               getMDOrNull(Record[2]))),<br class="">
> -                             NextMetadataNo++);<br class="">
> +                             NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_OBJC_PROPERTY: {<br class="">
> @@ -1474,7 +1503,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                          getMDOrNull(Record[2]), Record[3],<br class="">
>                          getMDString(Record[4]), getMDString(Record[5]),<br class="">
>                          Record[6], getDITypeRefOrNull(Record[7]))<wbr class="">),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_IMPORTED_<wbr class="">ENTITY: {<br class="">
> @@ -1487,7 +1517,8 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>                         (Context, Record[1], getMDOrNull(Record[2]),<br class="">
>                          getDITypeRefOrNull(Record[3]), Record[4],<br class="">
>                          getMDString(Record[5]))),<br class="">
> -        NextMetadataNo++);<br class="">
> +        NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_STRING_OLD: {<br class="">
> @@ -1497,13 +1528,15 @@ Error MetadataLoader::<wbr class="">MetadataLoaderImpl<br class="">
>     HasSeenOldLoopTags |= mayBeOldLoopAttachmentTag(<wbr class="">String);<br class="">
>     ++NumMDStringLoaded;<br class="">
>     Metadata *MD = MDString::get(Context, String);<br class="">
> -    MetadataList.assignValue(MD, NextMetadataNo++);<br class="">
> +    MetadataList.assignValue(MD, NextMetadataNo);<br class="">
> +    NextMetadataNo++;<br class="">
>     break;<br class="">
>   }<br class="">
>   case bitc::METADATA_STRINGS: {<br class="">
>     auto CreateNextMDString = [&](StringRef Str) {<br class="">
>       ++NumMDStringLoaded;<br class="">
> -      MetadataList.assignValue(<wbr class="">MDString::get(Context, Str), NextMetadataNo++);<br class="">
> +      MetadataList.assignValue(<wbr class="">MDString::get(Context, Str), NextMetadataNo);<br class="">
> +      NextMetadataNo++;<br class="">
>     };<br class="">
>     if (Error Err = parseMetadataStrings(Record, Blob, CreateNextMDString))<br class="">
>       return Err;<br class="">
><br class="">
><br class="">
> ______________________________<wbr class="">_________________<br class="">
> llvm-commits mailing list<br class="">
> <a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/<wbr class="">mailman/listinfo/llvm-commits</a><br class="">
<br class="">
</blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></div></body></html>