[Backport to llvm_release_200] [DebugInfo] Use native for the system separator for source path string (#3169)

Backport of PR #3157 into `llvm_release_200`.

All commits applied cleanly.

Signed-off-by: Sidorov, Dmitry <[email protected]>
Co-authored-by: Dmitry Sidorov <[email protected]>

Author: github-actions[bot]

lib/SPIRV/OCLUtil.h

@@ -461,11 +461,12 @@ SmallVector<unsigned, 3> decodeMDNode(MDNode *N);
 template <typename T> std::string getFullPath(const T *Scope) {
   if (!Scope)
     return std::string();
-  std::string Filename = Scope->getFilename().str();
-  if (sys::path::is_absolute(Filename))
-    return Filename;
+  StringRef Filename = Scope->getFilename();
+  auto Style = sys::path::Style::native;
+  if (sys::path::is_absolute(Filename, Style))
+    return Filename.str();
   SmallString<16> DirName = Scope->getDirectory();
-  sys::path::append(DirName, sys::path::Style::posix, Filename);
+  sys::path::append(DirName, Style, Filename.str());
   return DirName.str().str();
 }
 

test/DebugInfo/LocalAddressSpace.ll

@@ -22,7 +22,7 @@
 ; CHECK: DW_TAG_variable
 ; CHECK-NEXT: DW_AT_name {{.*}} = "a")
 ; CHECK-NEXT: DW_AT_type {{.*}} "int")
-; CHECK-NEXT: DW_AT_decl_file {{.*}} ("/work/tmp{{[/\\]}}tmp.cl")
+; CHECK-NEXT: DW_AT_decl_file {{.*}} ("/work{{[/\\]}}tmp{{[/\\]}}tmp.cl")
 ; CHECK-NEXT: DW_AT_decl_line {{.*}} (2)
 ; CHECK-NEXT: DW_AT_location [DW_FORM_exprloc]      (DW_OP_addr 0x0)
 

test/RelativeSrcPath.ll renamed to test/DebugInfo/RelativeSrcPath.ll

@@ -49,7 +49,7 @@ attributes #0 = { convergent noinline nounwind optnone "correctly-rounded-divide
 !6 = !{i32 1, i32 2}
 !7 = !{!"clang version 8.0.0 (cfe/trunk)"}
 !8 = distinct !DISubprogram(name: "foo", scope: !9, file: !9, line: 1, type: !10, isLocal: false, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-; CHECK: String [[ID:[0-9]+]] "/tmp/RelativeSrcPath.cl"
+; CHECK: String [[ID:[0-9]+]] "/tmp{{[/\\]}}RelativeSrcPath.cl"
 ; CHECK: Line [[ID]]
 !9 = !DIFile(filename: "RelativeSrcPath.cl", directory: "/tmp")
 !10 = !DISubroutineType(types: !2)