Skip to content

Commit a7c757a

Browse files
[llvm-debuginfo-analyzer] IR Reader.
Updated test cases that failed due to an upstream fix related to the high-pc value being now exclusive. #153318
1 parent 5586259 commit a7c757a

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

llvm/test/tools/llvm-debuginfo-analyzer/IR/02-ir-logical-lines.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@
5757
; ONE-NEXT: [003] {Code} 'addq $0x10, %rsp'
5858
; ONE-NEXT: [003] {Code} 'popq %rbp'
5959
; ONE-NEXT: [003] {Code} 'retq'
60-
; ONE-NEXT: [003] 6 {Line}
60+
; ONE-NEXT: [002] 6 {Line}

llvm/test/tools/llvm-debuginfo-analyzer/IR/03-ir-incorrect-lexical-scope-typedef.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@
9292
; ONE-NEXT: [005] 9 {Line}
9393
; ONE-NEXT: [005] 9 {Line}
9494
; ONE-NEXT: [005] 10 {Line}
95-
; ONE-NEXT: [005] 13 {Line}
9695
; ONE-NEXT: [004] 7 {TypeAlias} 'FLOAT' -> 'float'
9796
; ONE-NEXT: [003] 3 {Parameter} 'Param' -> 'char'
9897
; ONE-NEXT: [003] 4 {TypeAlias} 'INT' -> 'int'
9998
; ONE-NEXT: [003] 5 {Variable} 'Value' -> 'INT'
10099
; ONE-NEXT: [003] 3 {Line}
101100
; ONE-NEXT: [003] 5 {Line}
102101
; ONE-NEXT: [003] 13 {Line}
102+
; ONE-NEXT: [003] 13 {Line}
103103
; ONE-NEXT: [003] 14 {Line}
104-
; ONE-NEXT: [003] 14 {Line}
104+
; ONE-NEXT: [002] 14 {Line}
105105

106106
; Using the selection facilities, we can produce a simple tabular
107107
; output showing just the logical types that are 'Typedef'.

llvm/unittests/DebugInfo/LogicalView/IRReaderTest.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,22 @@ void checkElementComparison(LVReader *Reference, LVReader *Target) {
186186

187187
// Get comparison table.
188188
LVPassTable PassTable = Compare.getPassTable();
189-
ASSERT_EQ(PassTable.size(), 9u);
189+
ASSERT_EQ(PassTable.size(), 6u);
190190

191191
LVReader *Reader;
192192
LVElement *Element;
193193
LVComparePass Pass;
194194

195+
// Reference: Missing DebugLine
196+
std::tie(Reader, Element, Pass) = PassTable[0];
197+
ASSERT_NE(Reader, nullptr);
198+
ASSERT_NE(Element, nullptr);
199+
EXPECT_EQ(Reader, Reference);
200+
EXPECT_EQ(Element->getLevel(), 3u);
201+
EXPECT_EQ(Element->getLineNumber(), 0u);
202+
EXPECT_EQ(Element->getName(), "");
203+
EXPECT_EQ(Pass, LVComparePass::Missing);
204+
195205
// Reference: Missing Variable 'CONSTANT'
196206
std::tie(Reader, Element, Pass) = PassTable[1];
197207
ASSERT_NE(Reader, nullptr);
@@ -212,18 +222,8 @@ void checkElementComparison(LVReader *Reference, LVReader *Target) {
212222
EXPECT_EQ(Element->getName(), "INTEGER");
213223
EXPECT_EQ(Pass, LVComparePass::Missing);
214224

215-
// Reference: Missing DebugLine
216-
std::tie(Reader, Element, Pass) = PassTable[4];
217-
ASSERT_NE(Reader, nullptr);
218-
ASSERT_NE(Element, nullptr);
219-
EXPECT_EQ(Reader, Reference);
220-
EXPECT_EQ(Element->getLevel(), 3u);
221-
EXPECT_EQ(Element->getLineNumber(), 8u);
222-
EXPECT_EQ(Element->getName(), "");
223-
EXPECT_EQ(Pass, LVComparePass::Missing);
224-
225225
// Target: Added Variable 'CONSTANT'
226-
std::tie(Reader, Element, Pass) = PassTable[6];
226+
std::tie(Reader, Element, Pass) = PassTable[3];
227227
ASSERT_NE(Reader, nullptr);
228228
ASSERT_NE(Element, nullptr);
229229
EXPECT_EQ(Reader, Target);
@@ -233,7 +233,7 @@ void checkElementComparison(LVReader *Reference, LVReader *Target) {
233233
EXPECT_EQ(Pass, LVComparePass::Added);
234234

235235
// Target: Added TypeDefinition 'INTEGER'
236-
std::tie(Reader, Element, Pass) = PassTable[7];
236+
std::tie(Reader, Element, Pass) = PassTable[4];
237237
ASSERT_NE(Reader, nullptr);
238238
ASSERT_NE(Element, nullptr);
239239
EXPECT_EQ(Reader, Target);
@@ -243,12 +243,12 @@ void checkElementComparison(LVReader *Reference, LVReader *Target) {
243243
EXPECT_EQ(Pass, LVComparePass::Added);
244244

245245
// Target: Added DebugLine
246-
std::tie(Reader, Element, Pass) = PassTable[8];
246+
std::tie(Reader, Element, Pass) = PassTable[5];
247247
ASSERT_NE(Reader, nullptr);
248248
ASSERT_NE(Element, nullptr);
249249
EXPECT_EQ(Reader, Target);
250-
EXPECT_EQ(Element->getLevel(), 4u);
251-
EXPECT_EQ(Element->getLineNumber(), 8u);
250+
EXPECT_EQ(Element->getLevel(), 2u);
251+
EXPECT_EQ(Element->getLineNumber(), 9u);
252252
EXPECT_EQ(Element->getName(), "");
253253
EXPECT_EQ(Pass, LVComparePass::Added);
254254
}

0 commit comments

Comments
 (0)