<div dir="ltr">I saw this too in a build of compiler-rt in a combined tree.<div><br></div><div>I've gone ahead and reverted thusly at the moment:</div><div><br></div><div>echristo@athyra ~/r/llvm-project> git push<br>To github.com:llvm/llvm-project.git<br>   cdb45605571..a8154e5e0c8  master -> master<br></div><div><br></div><div>as it looks like Dave has headed home.</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Dec 12, 2019 at 5:46 PM Vedant Kumar 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:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div style="overflow-wrap: break-word;">Hi,<div><br></div><div>Just a heads-up that the lldb / debuginfo-tests bot started failing when this landed:</div><div><br></div><div><a href="http://lab.llvm.org:8080/green/view/LLDB/job/lldb-cmake/4676/" target="_blank">http://lab.llvm.org:8080/green/view/LLDB/job/lldb-cmake/4676/</a></div><div><br></div><div><pre style="box-sizing:border-box;white-space:pre-wrap;margin-top:0px;margin-bottom:0px;color:rgb(51,51,51);font-size:13px">Stack dump:
0.      Program arguments: /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/bin/clang-10 -cc1 -triple x86_64-apple-macosx10.14.0 -Wdeprecated-objc-isa-usage -Werror=deprecated-objc-isa-usage -emit-obj -mrelax-all -disable-free -main-file-name foreach.m -mrelocation-model pic -pic-level 2 -mthread-model posix -mframe-pointer=all -fno-rounding-math -masm-verbose -munwind-tables -target-sdk-version=10.14 -target-cpu penryn -dwarf-column-info -debug-info-kind=standalone -dwarf-version=4 -debugger-tuning=lldb -target-linker-version 409.12 -resource-dir /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lib/clang/10.0.99 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -internal-isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/local/include -internal-isystem /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/lib/clang/10.0.99/include -internal-externc-isystem /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/include -O0 -fdebug-compilation-dir /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/projects/debuginfo-tests/llgdb-tests -ferror-limit 19 -fmessage-length 0 -stack-protector 1 -fblocks -fencode-extended-block-signature -fregister-global-dtors-with-atexit -fgnuc-version=4.2.1 -fobjc-runtime=macosx-10.14.0 -fobjc-exceptions -fexceptions -fmax-type-align=16 -fdiagnostics-show-option -o /Users/buildslave/jenkins/workspace/lldb-cmake/lldb-build/projects/debuginfo-tests/llgdb-tests/Output/foreach.m.tmp.o -x objective-c /Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/debuginfo-tests/llgdb-tests/foreach.m 
1.      <eof> parser at end of file
2.      Code generation
0  clang-10                 0x000000010a6d1785 llvm::sys::PrintStackTrace(llvm::raw_ostream&) + 37
1  clang-10                 0x000000010a6d0698 llvm::sys::RunSignalHandlers() + 248
2  clang-10                 0x000000010a6d1d76 SignalHandler(int) + 262
3  libsystem_platform.dylib 0x00007fff588d1b3d _sigtramp + 29
4  clang-10                 0x000000010a2d2ca0 llvm::MCObjectStreamer::EmitBytes(llvm::StringRef) + 144
5  clang-10                 0x000000010a2ca553 (anonymous namespace)::MCMachOStreamer::EmitLabel(llvm::MCSymbol*, llvm::SMLoc) + 35
6  clang-10                 0x000000010b1b139d llvm::DwarfDebug::emitDebugRangesImpl(llvm::DwarfFile const&, llvm::MCSection*) + 429
7  clang-10                 0x000000010b1a8c58 llvm::DwarfDebug::endModule() + 376
8  clang-10                 0x000000010b177d5e llvm::AsmPrinter::doFinalization(llvm::Module&) + 1998
9  clang-10                 0x0000000109f51c96 llvm::FPPassManager::doFinalization(llvm::Module&) + 54
10 clang-10                 0x0000000109f52206 llvm::legacy::PassManagerImpl::run(llvm::Module&) + 1334
11 clang-10                 0x000000010a916cd2 clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, clang::BackendAction, std::__1::unique_ptr<llvm::raw_pwrite_stream, std::__1::default_delete<llvm::raw_pwrite_stream> >) + 13698
12 clang-10                 0x000000010abda154 clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) + 1108
13 clang-10                 0x000000010bc292b3 clang::ParseAST(clang::Sema&, bool, bool) + 643
14 clang-10                 0x000000010aeeb4d3 clang::FrontendAction::Execute() + 99
15 clang-10                 0x000000010ae7c3e3 clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) + 1619
16 clang-10                 0x000000010af60a0c clang::ExecuteCompilerInvocation(clang::CompilerInstance*) + 1772
17 clang-10                 0x0000000108849979 cc1_main(llvm::ArrayRef<char const*>, char const*, void*) + 2233</pre><div><br></div><div>vedant</div><div><br><blockquote type="cite"><div>On Dec 12, 2019, at 4:54 PM, David Blaikie via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:</div><br><div><div><br>Author: David Blaikie<br>Date: 2019-12-12T16:53:59-08:00<br>New Revision: 8e04896288d22ed8bef7ac367923374f96b753d6<br><br>URL: <a href="https://github.com/llvm/llvm-project/commit/8e04896288d22ed8bef7ac367923374f96b753d6" target="_blank">https://github.com/llvm/llvm-project/commit/8e04896288d22ed8bef7ac367923374f96b753d6</a><br>DIFF: <a href="https://github.com/llvm/llvm-project/commit/8e04896288d22ed8bef7ac367923374f96b753d6.diff" target="_blank">https://github.com/llvm/llvm-project/commit/8e04896288d22ed8bef7ac367923374f96b753d6.diff</a><br><br>LOG: NFC: DebugInfo: Refactor RangeSpanList to be a struct, like DebugLocStream::List<br><br>Move these data structures closer together so their emission code can<br>eventually share more of its implementation.<br><br>Added: <br><br><br>Modified: <br>    llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>    llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>    llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp<br>    llvm/lib/CodeGen/AsmPrinter/DwarfFile.h<br><br>Removed: <br><br><br><br>################################################################################<br>diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>index 0f3d8c689fa0..5707f962b4be 100644<br>--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>@@ -503,10 +503,10 @@ void DwarfCompileUnit::addScopeRangeList(DIE &ScopeDIE,<br>     const MCSymbol *RangeSectionSym =<br>         TLOF.getDwarfRangesSection()->getBeginSymbol();<br>     if (isDwoUnit())<br>-      addSectionDelta(ScopeDIE, dwarf::DW_AT_ranges, List.getSym(),<br>+      addSectionDelta(ScopeDIE, dwarf::DW_AT_ranges, List.Label,<br>                       RangeSectionSym);<br>     else<br>-      addSectionLabel(ScopeDIE, dwarf::DW_AT_ranges, List.getSym(),<br>+      addSectionLabel(ScopeDIE, dwarf::DW_AT_ranges, List.Label,<br>                       RangeSectionSym);<br>   }<br> }<br><br>diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>index aa33659cd06e..62745f9bee72 100644<br>--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>@@ -2331,7 +2331,7 @@ static MCSymbol *emitRnglistsTableHeader(AsmPrinter *Asm,<br>   Asm->OutStreamer->EmitLabel(Holder.getRnglistsTableBaseSym());<br><br>   for (const RangeSpanList &List : Holder.getRangeLists())<br>-    Asm->EmitLabelDifference(List.getSym(), Holder.getRnglistsTableBaseSym(),<br>+    Asm->EmitLabelDifference(List.Label, Holder.getRnglistsTableBaseSym(),<br>                              4);<br><br>   return TableEnd;<br>@@ -2688,11 +2688,11 @@ void DwarfDebug::emitDebugARanges() {<br> /// Emit a single range list. We handle both DWARF v5 and earlier.<br> static void emitRangeList(DwarfDebug &DD, AsmPrinter *Asm,<br>                           const RangeSpanList &List) {<br>-  emitRangeList(DD, Asm, List.getSym(), List.getRanges(), List.getCU(),<br>+  emitRangeList(DD, Asm, List.Label, List.Ranges, *List.CU,<br>                 dwarf::DW_RLE_base_addressx, dwarf::DW_RLE_offset_pair,<br>                 dwarf::DW_RLE_startx_length, dwarf::DW_RLE_end_of_list,<br>                 llvm::dwarf::RangeListEncodingString,<br>-                List.getCU().getCUNode()->getRangesBaseAddress() ||<br>+                List.CU->getCUNode()->getRangesBaseAddress() ||<br>                     DD.getDwarfVersion() >= 5,<br>                 [](auto) {});<br> }<br>@@ -2709,8 +2709,9 @@ void DwarfDebug::emitDebugRangesImpl(const DwarfFile &Holder, MCSection *Section<br><br>   Asm->OutStreamer->SwitchSection(Section);<br><br>-  MCSymbol *TableEnd =<br>-      getDwarfVersion() < 5 ? nullptr : emitRnglistsTableHeader(Asm, Holder);<br>+  MCSymbol *TableEnd = nullptr;<br>+  if (getDwarfVersion() < 5)<br>+    TableEnd = emitRnglistsTableHeader(Asm, Holder);<br><br>   for (const RangeSpanList &List : Holder.getRangeLists())<br>     emitRangeList(*this, Asm, List);<br><br>diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp<br>index e3c9095d1343..e5c4db58f477 100644<br>--- a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp<br>+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp<br>@@ -126,6 +126,6 @@ void DwarfFile::addScopeLabel(LexicalScope *LS, DbgLabel *Label) {<br> std::pair<uint32_t, RangeSpanList *><br> DwarfFile::addRange(const DwarfCompileUnit &CU, SmallVector<RangeSpan, 2> R) {<br>   CURangeLists.push_back(<br>-      RangeSpanList(Asm->createTempSymbol("debug_ranges"), CU, std::move(R)));<br>+      RangeSpanList{Asm->createTempSymbol("debug_ranges"), &CU, std::move(R)});<br>   return std::make_pair(CURangeLists.size() - 1, &CURangeLists.back());<br> }<br><br>diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.h b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.h<br>index 35fa51fb24c4..cf293d7534d0 100644<br>--- a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.h<br>+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.h<br>@@ -37,21 +37,12 @@ struct RangeSpan {<br>   const MCSymbol *End;<br> };<br><br>-class RangeSpanList {<br>-private:<br>+struct RangeSpanList {<br>   // Index for locating within the debug_range section this particular span.<br>-  MCSymbol *RangeSym;<br>+  MCSymbol *Label;<br>   const DwarfCompileUnit *CU;<br>   // List of ranges.<br>   SmallVector<RangeSpan, 2> Ranges;<br>-<br>-public:<br>-  RangeSpanList(MCSymbol *Sym, const DwarfCompileUnit &CU,<br>-                SmallVector<RangeSpan, 2> Ranges)<br>-      : RangeSym(Sym), CU(&CU), Ranges(std::move(Ranges)) {}<br>-  MCSymbol *getSym() const { return RangeSym; }<br>-  const DwarfCompileUnit &getCU() const { return *CU; }<br>-  const SmallVectorImpl<RangeSpan> &getRanges() const { return Ranges; }<br> };<br><br> class DwarfFile {<br><br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br><a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br></div></div></blockquote></div><br></div></div>_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>