From: Paul Robinson <paul.robinson@sony.com>
Date: Tue, 21 May 2019 12:48:46 +0000 (+0000)
Subject: [DebugInfo] Fix tests missed by r362148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcc137231efbc5ce39692f011a9e1529d763e5d4;p=llvm

[DebugInfo] Fix tests missed by r362148

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361251 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/DebugInfo/X86/asm-macro-line-number.s b/test/DebugInfo/X86/asm-macro-line-number.s
index 8b0843d0613..f7aa029fb02 100644
--- a/test/DebugInfo/X86/asm-macro-line-number.s
+++ b/test/DebugInfo/X86/asm-macro-line-number.s
@@ -18,17 +18,17 @@
 function:
  return 0
 
-# CHECK: .file 2 "reduced.S"
-# CHECK: .loc 2 8 0
+# CHECK: .file 1 "reduced.S"
+# CHECK: .loc 1 8 0
 # CHECK: movl %eax, 0
-# CHECK: .loc 2 8 0
+# CHECK: .loc 1 8 0
 # CHECK: retl
 
 # 42 "reduced.S"
 function2:
  return2 0
 
-# CHECK: .loc 2 43 0
+# CHECK: .loc 1 43 0
 # CHECK: movl %eax, 0
-# CHECK: .loc 2 43 0
+# CHECK: .loc 1 43 0
 # CHECK: retl
diff --git a/test/MC/MachO/gen-dwarf-cpp.s b/test/MC/MachO/gen-dwarf-cpp.s
index 3cb26ce6081..f2364fe0c92 100644
--- a/test/MC/MachO/gen-dwarf-cpp.s
+++ b/test/MC/MachO/gen-dwarf-cpp.s
@@ -14,20 +14,16 @@ L1:	leave
 // rdar://9275556
 
 // We check that the source name "t.s" is picked up
-// CHECK: include_directories[  1] = "{{.*(/|\\\\)}}test{{(/|\\\\)}}MC{{(/|\\\\)}}MachO"
-// CHECK: include_directories[  2] = "inc"
+// CHECK: include_directories[  1] = "inc"
 // CHECK: file_names[  1]:
-// CHECK-NEXT: name: "gen-dwarf-cpp.s"
-// CHECK-NEXT: dir_index: 1
-// CHECK: file_names[  2]:
-// CHECK-NEXT: name: "t.s"
+/ CHECK-NEXT: name: "t.s"
 // CHECK-NEXT: dir_index: 0
-// CHECK: file_names[  3]:
+// CHECK: file_names[  2]:
 // CHECK-NEXT: name: "g.s"
-// CHECK-NEXT: dir_index: 2
+// CHECK-NEXT: dir_index: 1
 // CHECK-NOT: file_names
 
 // We check that the source line number 100 is picked up before the "movl"
 // CHECK: Address            Line   Column File   ISA Discriminator Flags
 // CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-// CHECK: 0x0000000000000000    102      0      2   0             0  is_stmt
+// CHECK: 0x0000000000000000    102      0      1   0             0  is_stmt
diff --git a/test/MC/MachO/gen-dwarf-macro-cpp.s b/test/MC/MachO/gen-dwarf-macro-cpp.s
index de40bbdd656..bdae7685d48 100644
--- a/test/MC/MachO/gen-dwarf-macro-cpp.s
+++ b/test/MC/MachO/gen-dwarf-macro-cpp.s
@@ -12,8 +12,5 @@
 
 // We check that the source name "foo.S" is picked up
 // CHECK: file_names[  1]:
-// CHECK-NEXT: name: "gen-dwarf-macro-cpp.s"
-// CHECK-NEXT: dir_index: 1
-// CHECK: file_names[  2]:
 // CHECK-NEXT: name: "foo.S"
 // CHECK-NEXT: dir_index: 0