<div dir="ltr">I think this is me to approve so: OK.<div><br></div><div>-eric</div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, Feb 7, 2017 at 12:00 PM Mehdi Amini via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Yes I’ve been by this in practice with LTO!<br class="gmail_msg">
<br class="gmail_msg">
—<br class="gmail_msg">
Mehdi<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
> On Feb 7, 2017, at 12:18 PM, Adrian Prantl via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br class="gmail_msg">
><br class="gmail_msg">
> I hereby nominate this commit for merging into the 4.0 release branch. It fixes a bug in the bitcode upgrade for DIGlobalVariables that was introduced in r290153 when DIGlobalVariableExpression was added. The bug manifests as a an IR verifier error.<br class="gmail_msg">
><br class="gmail_msg">
> -- adrian<br class="gmail_msg">
><br class="gmail_msg">
><br class="gmail_msg">
>> On Feb 7, 2017, at 9:35 AM, Adrian Prantl via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br class="gmail_msg">
>><br class="gmail_msg">
>> Author: adrian<br class="gmail_msg">
>> Date: Tue Feb 7 11:35:41 2017<br class="gmail_msg">
>> New Revision: 294318<br class="gmail_msg">
>><br class="gmail_msg">
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=294318&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=294318&view=rev</a><br class="gmail_msg">
>> Log:<br class="gmail_msg">
>> Fix the bitcode upgrade for DIGlobalVariable in a DIImportedEntity context.<br class="gmail_msg">
>><br class="gmail_msg">
>> The bitcode upgrade for DIGlobalVariable unconditionally wrapped<br class="gmail_msg">
>> DIGlobalVariables in a DIGlobalVariableExpression. When a<br class="gmail_msg">
>> DIGlobalVariable is referenced by a DIImportedEntity, however, this is<br class="gmail_msg">
>> wrong. This patch fixes the bitcode upgrade by deferring the creation<br class="gmail_msg">
>> of DIGlobalVariableExpressions until we know the context of the<br class="gmail_msg">
>> DIGlobalVariable.<br class="gmail_msg">
>><br class="gmail_msg">
>> <rdar://problem/30134279><br class="gmail_msg">
>><br class="gmail_msg">
>> Differential Revision: <a href="https://reviews.llvm.org/D29349" rel="noreferrer" class="gmail_msg" target="_blank">https://reviews.llvm.org/D29349</a><br class="gmail_msg">
>><br class="gmail_msg">
>> Modified:<br class="gmail_msg">
>> llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp<br class="gmail_msg">
>> llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll<br class="gmail_msg">
>> llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll.bc<br class="gmail_msg">
>> llvm/trunk/test/Bitcode/dityperefs-3.8.ll<br class="gmail_msg">
>><br class="gmail_msg">
>> Modified: llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp<br class="gmail_msg">
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp?rev=294318&r1=294317&r2=294318&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp?rev=294318&r1=294317&r2=294318&view=diff</a><br class="gmail_msg">
>> ==============================================================================<br class="gmail_msg">
>> --- llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp (original)<br class="gmail_msg">
>> +++ llvm/trunk/lib/Bitcode/Reader/MetadataLoader.cpp Tue Feb 7 11:35:41 2017<br class="gmail_msg">
>> @@ -451,6 +451,7 @@ class MetadataLoader::MetadataLoaderImpl<br class="gmail_msg">
>><br class="gmail_msg">
>> bool StripTBAA = false;<br class="gmail_msg">
>> bool HasSeenOldLoopTags = false;<br class="gmail_msg">
>> + bool NeedUpgradeToDIGlobalVariableExpression = false;<br class="gmail_msg">
>><br class="gmail_msg">
>> /// True if metadata is being parsed for a module being ThinLTO imported.<br class="gmail_msg">
>> bool IsImporting = false;<br class="gmail_msg">
>> @@ -476,6 +477,45 @@ class MetadataLoader::MetadataLoaderImpl<br class="gmail_msg">
>> CUSubprograms.clear();<br class="gmail_msg">
>> }<br class="gmail_msg">
>><br class="gmail_msg">
>> + /// Upgrade old-style bare DIGlobalVariables to DIGlobalVariableExpressions.<br class="gmail_msg">
>> + void upgradeCUVariables() {<br class="gmail_msg">
>> + if (!NeedUpgradeToDIGlobalVariableExpression)<br class="gmail_msg">
>> + return;<br class="gmail_msg">
>> +<br class="gmail_msg">
>> + // Upgrade list of variables attached to the CUs.<br class="gmail_msg">
>> + if (NamedMDNode *CUNodes = TheModule.getNamedMetadata("<a href="http://llvm.dbg.cu" rel="noreferrer" class="gmail_msg" target="_blank">llvm.dbg.cu</a>"))<br class="gmail_msg">
>> + for (unsigned I = 0, E = CUNodes->getNumOperands(); I != E; ++I) {<br class="gmail_msg">
>> + auto *CU = cast<DICompileUnit>(CUNodes->getOperand(I));<br class="gmail_msg">
>> + if (auto *GVs = dyn_cast_or_null<MDTuple>(CU->getRawGlobalVariables()))<br class="gmail_msg">
>> + for (unsigned I = 0; I < GVs->getNumOperands(); I++)<br class="gmail_msg">
>> + if (auto *GV =<br class="gmail_msg">
>> + dyn_cast_or_null<DIGlobalVariable>(GVs->getOperand(I))) {<br class="gmail_msg">
>> + auto *DGVE =<br class="gmail_msg">
>> + DIGlobalVariableExpression::getDistinct(Context, GV, nullptr);<br class="gmail_msg">
>> + GVs->replaceOperandWith(I, DGVE);<br class="gmail_msg">
>> + }<br class="gmail_msg">
>> + }<br class="gmail_msg">
>> +<br class="gmail_msg">
>> + // Upgrade variables attached to globals.<br class="gmail_msg">
>> + for (auto &GV : TheModule.globals()) {<br class="gmail_msg">
>> + SmallVector<MDNode *, 1> MDs, NewMDs;<br class="gmail_msg">
>> + GV.getMetadata(LLVMContext::MD_dbg, MDs);<br class="gmail_msg">
>> + GV.eraseMetadata(LLVMContext::MD_dbg);<br class="gmail_msg">
>> + for (auto *MD : MDs)<br class="gmail_msg">
>> + if (auto *DGV = dyn_cast_or_null<DIGlobalVariable>(MD)) {<br class="gmail_msg">
>> + auto *DGVE =<br class="gmail_msg">
>> + DIGlobalVariableExpression::getDistinct(Context, DGV, nullptr);<br class="gmail_msg">
>> + GV.addMetadata(LLVMContext::MD_dbg, *DGVE);<br class="gmail_msg">
>> + } else<br class="gmail_msg">
>> + GV.addMetadata(LLVMContext::MD_dbg, *MD);<br class="gmail_msg">
>> + }<br class="gmail_msg">
>> + }<br class="gmail_msg">
>> +<br class="gmail_msg">
>> + void upgradeDebugInfo() {<br class="gmail_msg">
>> + upgradeCUSubprograms();<br class="gmail_msg">
>> + upgradeCUVariables();<br class="gmail_msg">
>> + }<br class="gmail_msg">
>> +<br class="gmail_msg">
>> public:<br class="gmail_msg">
>> MetadataLoaderImpl(BitstreamCursor &Stream, Module &TheModule,<br class="gmail_msg">
>> BitcodeReaderValueList &ValueList,<br class="gmail_msg">
>> @@ -729,7 +769,7 @@ Error MetadataLoader::MetadataLoaderImpl<br class="gmail_msg">
>> // Reading the named metadata created forward references and/or<br class="gmail_msg">
>> // placeholders, that we flush here.<br class="gmail_msg">
>> resolveForwardRefsAndPlaceholders(Placeholders);<br class="gmail_msg">
>> - upgradeCUSubprograms();<br class="gmail_msg">
>> + upgradeDebugInfo();<br class="gmail_msg">
>> // Return at the beginning of the block, since it is easy to skip it<br class="gmail_msg">
>> // entirely from there.<br class="gmail_msg">
>> Stream.ReadBlockEnd(); // Pop the abbrev block context.<br class="gmail_msg">
>> @@ -753,7 +793,7 @@ Error MetadataLoader::MetadataLoaderImpl<br class="gmail_msg">
>> return error("Malformed block");<br class="gmail_msg">
>> case BitstreamEntry::EndBlock:<br class="gmail_msg">
>> resolveForwardRefsAndPlaceholders(Placeholders);<br class="gmail_msg">
>> - upgradeCUSubprograms();<br class="gmail_msg">
>> + upgradeDebugInfo();<br class="gmail_msg">
>> return Error::success();<br class="gmail_msg">
>> case BitstreamEntry::Record:<br class="gmail_msg">
>> // The interesting case.<br class="gmail_msg">
>> @@ -1424,11 +1464,17 @@ Error MetadataLoader::MetadataLoaderImpl<br class="gmail_msg">
>> getDITypeRefOrNull(Record[6]), Record[7], Record[8],<br class="gmail_msg">
>> getMDOrNull(Record[10]), AlignInBits));<br class="gmail_msg">
>><br class="gmail_msg">
>> - auto *DGVE = DIGlobalVariableExpression::getDistinct(Context, DGV, Expr);<br class="gmail_msg">
>> - MetadataList.assignValue(DGVE, NextMetadataNo);<br class="gmail_msg">
>> - NextMetadataNo++;<br class="gmail_msg">
>> + DIGlobalVariableExpression *DGVE = nullptr;<br class="gmail_msg">
>> + if (Attach || Expr)<br class="gmail_msg">
>> + DGVE = DIGlobalVariableExpression::getDistinct(Context, DGV, Expr);<br class="gmail_msg">
>> + else<br class="gmail_msg">
>> + NeedUpgradeToDIGlobalVariableExpression = true;<br class="gmail_msg">
>> if (Attach)<br class="gmail_msg">
>> Attach->addDebugInfo(DGVE);<br class="gmail_msg">
>> +<br class="gmail_msg">
>> + auto *MDNode = Expr ? cast<Metadata>(DGVE) : cast<Metadata>(DGV);<br class="gmail_msg">
>> + MetadataList.assignValue(MDNode, NextMetadataNo);<br class="gmail_msg">
>> + NextMetadataNo++;<br class="gmail_msg">
>> } else<br class="gmail_msg">
>> return error("Invalid record");<br class="gmail_msg">
>><br class="gmail_msg">
>><br class="gmail_msg">
>> Modified: llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll<br class="gmail_msg">
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll?rev=294318&r1=294317&r2=294318&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll?rev=294318&r1=294317&r2=294318&view=diff</a><br class="gmail_msg">
>> ==============================================================================<br class="gmail_msg">
>> --- llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll (original)<br class="gmail_msg">
>> +++ llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll Tue Feb 7 11:35:41 2017<br class="gmail_msg">
>> @@ -7,12 +7,16 @@<br class="gmail_msg">
>> ; CHECK: @h = common global i32 0, align 4, !dbg ![[H:[0-9]+]]<br class="gmail_msg">
>> ; CHECK: ![[G]] = {{.*}}!DIGlobalVariableExpression(var: ![[GVAR:[0-9]+]], expr: ![[GEXPR:[0-9]+]])<br class="gmail_msg">
>> ; CHECK: ![[GVAR]] = distinct !DIGlobalVariable(name: "g",<br class="gmail_msg">
>> +; CHECK: DICompileUnit({{.*}}, imports: ![[IMPORTS:[0-9]+]]<br class="gmail_msg">
>> ; CHECK: !DIGlobalVariableExpression(var: ![[CVAR:[0-9]+]], expr: ![[CEXPR:[0-9]+]])<br class="gmail_msg">
>> ; CHECK: ![[CVAR]] = distinct !DIGlobalVariable(name: "c",<br class="gmail_msg">
>> ; CHECK: ![[CEXPR]] = !DIExpression(DW_OP_constu, 23, DW_OP_stack_value)<br class="gmail_msg">
>> -; CHECK: ![[H]] = {{.*}}!DIGlobalVariableExpression(var: ![[HVAR:[0-9]+]])<br class="gmail_msg">
>> -; CHECK: ![[HVAR]] = distinct !DIGlobalVariable(name: "h",<br class="gmail_msg">
>> +; CHECK: ![[HVAR:[0-9]+]] = distinct !DIGlobalVariable(name: "h",<br class="gmail_msg">
>> +; CHECK: ![[IMPORTS]] = !{![[CIMPORT:[0-9]+]]}<br class="gmail_msg">
>> +; CHECK: ![[CIMPORT]] = !DIImportedEntity({{.*}}entity: ![[HVAR]]<br class="gmail_msg">
>> ; CHECK: ![[GEXPR]] = !DIExpression(DW_OP_plus, 1)<br class="gmail_msg">
>> +; CHECK: ![[H]] = {{.*}}!DIGlobalVariableExpression(var: ![[HVAR]])<br class="gmail_msg">
>> +<br class="gmail_msg">
>> @g = common global i32 0, align 4, !dbg !0<br class="gmail_msg">
>> @h = common global i32 0, align 4, !dbg !11<br class="gmail_msg">
>><br class="gmail_msg">
>> @@ -21,9 +25,9 @@<br class="gmail_msg">
>> !llvm.ident = !{!9}<br class="gmail_msg">
>><br class="gmail_msg">
>> !0 = distinct !DIGlobalVariable(name: "g", scope: !1, file: !2, line: 1, type: !5, isLocal: false, isDefinition: true, expr: !DIExpression(DW_OP_plus, 1))<br class="gmail_msg">
>> -!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2, producer: "clang version 4.0.0 (trunk 286129) (llvm/trunk 286128)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !3, globals: !4)<br class="gmail_msg">
>> +!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2, producer: "clang version 4.0.0 (trunk 286129) (llvm/trunk 286128)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, imports: !3)<br class="gmail_msg">
>> !2 = !DIFile(filename: "a.c", directory: "/")<br class="gmail_msg">
>> -!3 = !{}<br class="gmail_msg">
>> +!3 = !{!12}<br class="gmail_msg">
>> !4 = !{!0, !10, !11}<br class="gmail_msg">
>> !5 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)<br class="gmail_msg">
>> !6 = !{i32 2, !"Dwarf Version", i32 4}<br class="gmail_msg">
>> @@ -32,3 +36,4 @@<br class="gmail_msg">
>> !9 = !{!"clang version 4.0.0 (trunk 286129) (llvm/trunk 286128)"}<br class="gmail_msg">
>> !10 = distinct !DIGlobalVariable(name: "c", scope: !1, file: !2, line: 1, type: !5, isLocal: false, isDefinition: true, expr: !DIExpression(DW_OP_constu, 23, DW_OP_stack_value))<br class="gmail_msg">
>> !11 = distinct !DIGlobalVariable(name: "h", scope: !1, file: !2, line: 2, type: !5, isLocal: false, isDefinition: true)<br class="gmail_msg">
>> +!12 = !DIImportedEntity(tag: DW_TAG_imported_declaration, line: 1, scope: !1, entity: !11)<br class="gmail_msg">
>><br class="gmail_msg">
>> Modified: llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll.bc<br class="gmail_msg">
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll.bc?rev=294318&r1=294317&r2=294318&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll.bc?rev=294318&r1=294317&r2=294318&view=diff</a><br class="gmail_msg">
>> ==============================================================================<br class="gmail_msg">
>> Binary files llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll.bc (original) and llvm/trunk/test/Bitcode/DIGlobalVariableExpression.ll.bc Tue Feb 7 11:35:41 2017 differ<br class="gmail_msg">
>><br class="gmail_msg">
>> Modified: llvm/trunk/test/Bitcode/dityperefs-3.8.ll<br class="gmail_msg">
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/dityperefs-3.8.ll?rev=294318&r1=294317&r2=294318&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/dityperefs-3.8.ll?rev=294318&r1=294317&r2=294318&view=diff</a><br class="gmail_msg">
>> ==============================================================================<br class="gmail_msg">
>> --- llvm/trunk/test/Bitcode/dityperefs-3.8.ll (original)<br class="gmail_msg">
>> +++ llvm/trunk/test/Bitcode/dityperefs-3.8.ll Tue Feb 7 11:35:41 2017<br class="gmail_msg">
>> @@ -18,14 +18,13 @@<br class="gmail_msg">
>> ; CHECK-NEXT: !7 = !DILocalVariable(name: "V1", scope: !6, type: !2)<br class="gmail_msg">
>> ; CHECK-NEXT: !8 = !DIObjCProperty(name: "P1", type: !1)<br class="gmail_msg">
>> ; CHECK-NEXT: !9 = !DITemplateTypeParameter(type: !1)<br class="gmail_msg">
>> -; CHECK-NEXT: !10 = distinct !DIGlobalVariableExpression(var: !11)<br class="gmail_msg">
>> -; CHECK-NEXT: !11 = !DIGlobalVariable(name: "G",{{.*}} type: !1,<br class="gmail_msg">
>> -; CHECK-NEXT: !12 = !DITemplateValueParameter(type: !1, value: i32* @G1)<br class="gmail_msg">
>> -; CHECK-NEXT: !13 = !DIImportedEntity(tag: DW_TAG_imported_module, name: "T2", scope: !0, entity: !1)<br class="gmail_msg">
>> -; CHECK-NEXT: !14 = !DICompositeType(tag: DW_TAG_structure_type, name: "T3", file: !0, elements: !15, identifier: "T3")<br class="gmail_msg">
>> -; CHECK-NEXT: !15 = !{!16}<br class="gmail_msg">
>> -; CHECK-NEXT: !16 = !DISubprogram(scope: !14,<br class="gmail_msg">
>> -; CHECK-NEXT: !17 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type,{{.*}} extraData: !14)<br class="gmail_msg">
>> +; CHECK-NEXT: !10 = !DIGlobalVariable(name: "G",{{.*}} type: !1,<br class="gmail_msg">
>> +; CHECK-NEXT: !11 = !DITemplateValueParameter(type: !1, value: i32* @G1)<br class="gmail_msg">
>> +; CHECK-NEXT: !12 = !DIImportedEntity(tag: DW_TAG_imported_module, name: "T2", scope: !0, entity: !1)<br class="gmail_msg">
>> +; CHECK-NEXT: !13 = !DICompositeType(tag: DW_TAG_structure_type, name: "T3", file: !0, elements: !14, identifier: "T3")<br class="gmail_msg">
>> +; CHECK-NEXT: !14 = !{!15}<br class="gmail_msg">
>> +; CHECK-NEXT: !15 = !DISubprogram(scope: !13,<br class="gmail_msg">
>> +; CHECK-NEXT: !16 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type,{{.*}} extraData: !13)<br class="gmail_msg">
>><br class="gmail_msg">
>> !0 = !DIFile(filename: "path/to/file", directory: "/path/to/dir")<br class="gmail_msg">
>> !1 = !DICompositeType(tag: DW_TAG_structure_type, name: "T1", file: !0, identifier: "T1")<br class="gmail_msg">
>><br class="gmail_msg">
>><br class="gmail_msg">
>> _______________________________________________<br class="gmail_msg">
>> llvm-commits mailing list<br class="gmail_msg">
>> <a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
>> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
><br class="gmail_msg">
> _______________________________________________<br class="gmail_msg">
> llvm-commits mailing list<br class="gmail_msg">
> <a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div>