From a5e0596dc4e458f1ffbce60ef82e194981db9232 Mon Sep 17 00:00:00 2001
From: Paul Robinson <paul.robinson@sony.com>
Date: Tue, 21 May 2019 12:48:46 +0000
Subject: [PATCH] [DebugInfo] Fix tests missed by r362148

llvm-svn: 361251
---
 llvm/test/DebugInfo/X86/asm-macro-line-number.s | 10 +++++-----
 llvm/test/MC/MachO/gen-dwarf-cpp.s              | 14 +++++---------
 llvm/test/MC/MachO/gen-dwarf-macro-cpp.s        |  3 ---
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/llvm/test/DebugInfo/X86/asm-macro-line-number.s b/llvm/test/DebugInfo/X86/asm-macro-line-number.s
index 8b0843d06138b..f7aa029fb021c 100644
--- a/llvm/test/DebugInfo/X86/asm-macro-line-number.s
+++ b/llvm/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/llvm/test/MC/MachO/gen-dwarf-cpp.s b/llvm/test/MC/MachO/gen-dwarf-cpp.s
index 3cb26ce6081ff..f2364fe0c9210 100644
--- a/llvm/test/MC/MachO/gen-dwarf-cpp.s
+++ b/llvm/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/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s b/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s
index de40bbdd65690..bdae7685d4830 100644
--- a/llvm/test/MC/MachO/gen-dwarf-macro-cpp.s
+++ b/llvm/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