[llvm] f75301d - Revert "DebugInfo: Check DW_OP_convert in loclists with Split DWARF"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-02-04T10:06:46-05:00
New Revision: f75301d16d444d8cb6810d679290df744bc79ec7

URL: https://github.com/llvm/llvm-project/commit/f75301d16d444d8cb6810d679290df744bc79ec7
DIFF: https://github.com/llvm/llvm-project/commit/f75301d16d444d8cb6810d679290df744bc79ec7.diff

LOG: Revert "DebugInfo: Check DW_OP_convert in loclists with Split DWARF"
and follow-ups.

This reverts commit 1ced28cbe75ff81f35ac2c71e941041eb3afcd00.
This reverts commit 4f281f047457ce3f1870a93253476222314f420b.
This reverts commit 552a8fe12bd1822f48dda2e9e8728a179f82d356.

The test fails on non-Linux.

Added: 
    

Modified: 
    llvm/lib/CodeGen/AsmPrinter/ByteStreamer.h
    llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
    llvm/test/DebugInfo/X86/convert-loclist.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/AsmPrinter/ByteStreamer.h b/llvm/lib/CodeGen/AsmPrinter/ByteStreamer.h
index b60f68ca59b8..09f7496cd4ef 100644
--- a/llvm/lib/CodeGen/AsmPrinter/ByteStreamer.h
+++ b/llvm/lib/CodeGen/AsmPrinter/ByteStreamer.h
@@ -50,7 +50,7 @@ class APByteStreamer final : public ByteStreamer {
   }
   void EmitULEB128(uint64_t DWord, const Twine &Comment, unsigned PadTo) override {
     AP.OutStreamer->AddComment(Comment);
-    AP.EmitULEB128(DWord, nullptr, PadTo);
+    AP.EmitULEB128(DWord);
   }
 };
 

diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 447d3fa3e206..0923394ceb6e 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2241,7 +2241,7 @@ void DwarfDebug::emitDebugLocEntry(ByteStreamer &Streamer,
         uint64_t Offset =
             CU->ExprRefedBaseTypes[Op.getRawOperand(I)].Die->getOffset();
         assert(Offset < (1ULL << (ULEB128PadSize * 7)) && "Offset wont fit");
-        Streamer.EmitULEB128(Offset, "", ULEB128PadSize);
+        Asm->EmitULEB128(Offset, nullptr, ULEB128PadSize);
         // Make sure comments stay aligned.
         for (unsigned J = 0; J < ULEB128PadSize; ++J)
           if (Comment != End)

diff  --git a/llvm/test/DebugInfo/X86/convert-loclist.ll b/llvm/test/DebugInfo/X86/convert-loclist.ll
index e510cd6f9eba..5ef81b3423c0 100644
--- a/llvm/test/DebugInfo/X86/convert-loclist.ll
+++ b/llvm/test/DebugInfo/X86/convert-loclist.ll
@@ -1,28 +1,6 @@
-; RUN: llc -dwarf-version=5 -filetype=obj -O0 < %s \
-; RUN:   | llvm-dwarfdump -debug-info -debug-loclists - | FileCheck %s
-; RUN: llc -dwarf-version=5 -split-dwarf-file=foo.dwo -filetype=obj -O0 < %s \
-; RUN:   | llvm-dwarfdump -debug-info -debug-loclists - | FileCheck --check-prefix=CHECK --check-prefix=SPLIT %s
-; RUN: llc -dwarf-version=5 -split-dwarf-file=foo.dwo -filetype=asm -O0 < %s | FileCheck --check-prefix=ASM %s
+; RUN: llc -dwarf-version=5 -filetype=obj -O0 < %s | llvm-dwarfdump -debug-loclists - | FileCheck %s
 
-; A bit of a brittle test - this is testing the specific DWO_id. The
-; alternative would be to test two files with 
diff erent DW_OP_convert values &
-; ensuring the DWO IDs 
diff er when the DW_OP_convert parameter 
diff ers.
-
-; So if this test ends up being a brittle pain to maintain, updating the DWO ID
-; often - add another IR file with a 
diff erent DW_OP_convert that's otherwise
-; identical and demonstrate that they have 
diff erent DWO IDs.
-
-; SPLIT: 0x00000000: Compile Unit: {{.*}} DWO_id = 0xafd73565c68bc661
-
-; Regression testing a fairly quirky bug where instead of hashing (see above),
-; extra bytes would be emitted into the output assembly in no
-; particular/intentional section - so let's check they don't show up at all:
-; ASM-NOT: .asciz  "\200\200\200"
-
-; CHECK: 0x{{0*}}[[TYPE:.*]]: DW_TAG_base_type
-; CHECK-NEXT:                   DW_AT_name ("DW_ATE_unsigned_32")
-
-; CHECK: DW_LLE_offset_pair ({{.*}}): DW_OP_consts +7, DW_OP_convert 0x[[TYPE]], DW_OP_stack_value
+; CHECK: DW_LLE_offset_pair (0x0000000000000006, 0x000000000000000c): DW_OP_consts +7, DW_OP_convert 0x27, DW_OP_stack_value
 
 
 ; Function Attrs: uwtable