kamleshbhalui updated this revision to Diff 334359.
kamleshbhalui added a comment.
updated patch
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D99580/new/
https://reviews.llvm.org/D99580
Files:
clang/lib/CodeGen/CGDebugInfo.cpp
clang/test/CodeGen/debug-info-preprocessed-file.i
clang/test/CodeGen/debug-prefix-map.c
clang/test/CodeGenCXX/debug-info-mingw.cpp
clang/test/CodeGenCXX/linetable-fnbegin.cpp
clang/test/Frontend/optimization-remark-line-directive.c
clang/test/Frontend/stdin-input.c
clang/test/Modules/module-debuginfo-prefix.m
clang/test/PCH/debug-info-pch-container-path.c
Index: clang/test/PCH/debug-info-pch-container-path.c
===================================================================
--- clang/test/PCH/debug-info-pch-container-path.c
+++ clang/test/PCH/debug-info-pch-container-path.c
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
// REQUIRES: asserts
// Modules:
Index: clang/test/Modules/module-debuginfo-prefix.m
===================================================================
--- clang/test/Modules/module-debuginfo-prefix.m
+++ clang/test/Modules/module-debuginfo-prefix.m
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
// REQUIRES: asserts
// Modules:
Index: clang/test/Frontend/stdin-input.c
===================================================================
--- clang/test/Frontend/stdin-input.c
+++ clang/test/Frontend/stdin-input.c
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
// RUN: cat %s | %clang -emit-llvm -g -S \
// RUN: -Xclang -main-file-name -Xclang test/foo.c -x c - -o - | FileCheck %s
// CHECK: ; ModuleID = 'test/foo.c'
Index: clang/test/Frontend/optimization-remark-line-directive.c
===================================================================
--- clang/test/Frontend/optimization-remark-line-directive.c
+++ clang/test/Frontend/optimization-remark-line-directive.c
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
// This file tests -Rpass diagnostics together with #line
// directives. We cannot map #line directives back to
// a SourceLocation.
Index: clang/test/CodeGenCXX/linetable-fnbegin.cpp
===================================================================
--- clang/test/CodeGenCXX/linetable-fnbegin.cpp
+++ clang/test/CodeGenCXX/linetable-fnbegin.cpp
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
// RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s
// Test that the line table info for Foo<T>::bar() is pointing to the
// right header file.
@@ -11,7 +12,6 @@
// We shouldn't need a lexical block for this function.
// CHECK: [[DBG]] = !DILocation(line: 23, column: 3, scope: [[SP]])
-
# 1 "./template.h" 1
template <typename T>
class Foo {
Index: clang/test/CodeGenCXX/debug-info-mingw.cpp
===================================================================
--- /dev/null
+++ clang/test/CodeGenCXX/debug-info-mingw.cpp
@@ -0,0 +1,9 @@
+// UNSUPPORTED: !system-windows
+// RUN: rm -rf %t/UNIQUE_DIR && mkdir -p %t/UNIQUE_DIR
+// RUN: cp %s %t/UNIQUE_DIR/debug-info-mingw.cpp
+// RUN: %clang_cc1 -triple x86_64-w64-windows-gnu -debug-info-kind=limited \
+// RUN: -main-file-name debug-info-mingw.cpp %t/UNIQUE_DIR/debug-info-mingw.cpp \
+// RUN: -emit-llvm -o - | FileCheck %s
+int main() {
+}
+// CHECK: !DIFile(filename: "{{.+}}\\UNIQUE_DIR\\debug-info-mingw.cpp",
Index: clang/test/CodeGen/debug-prefix-map.c
===================================================================
--- clang/test/CodeGen/debug-prefix-map.c
+++ clang/test/CodeGen/debug-prefix-map.c
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - | FileCheck %s -check-prefix CHECK-NO-MAIN-FILE-NAME
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH=empty %s -emit-llvm -o - | FileCheck %s -check-prefix CHECK-EVIL
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - -main-file-name debug-prefix-map.c | FileCheck %s
Index: clang/test/CodeGen/debug-info-preprocessed-file.i
===================================================================
--- clang/test/CodeGen/debug-info-preprocessed-file.i
+++ clang/test/CodeGen/debug-info-preprocessed-file.i
@@ -1,3 +1,4 @@
+// UNSUPPORTED: system-windows
# 1 "/foo/bar/preprocessed-input.c"
# 1 "<built-in>" 1
# 1 "<built-in>" 3
Index: clang/lib/CodeGen/CGDebugInfo.cpp
===================================================================
--- clang/lib/CodeGen/CGDebugInfo.cpp
+++ clang/lib/CodeGen/CGDebugInfo.cpp
@@ -444,6 +444,10 @@
StringRef Dir;
StringRef File;
std::string RemappedFile = remapDIPath(FileName);
+ // Convert RemappedFile to native style
+ SmallString<128> NativeFileName = StringRef(RemappedFile);
+ llvm::sys::path::native(NativeFileName);
+ RemappedFile = (std::string)NativeFileName.str();
std::string CurDir = remapDIPath(getCurrentDirname());
SmallString<128> DirBuf;
SmallString<128> FileBuf;
@@ -618,9 +622,14 @@
// file was specified with an absolute path.
if (CSKind)
CSInfo.emplace(*CSKind, Checksum);
- llvm::DIFile *CUFile = DBuilder.createFile(
- remapDIPath(MainFileName), remapDIPath(getCurrentDirname()), CSInfo,
- getSource(SM, SM.getMainFileID()));
+ // Convert MainFileName to native style
+ SmallString<128> NativeMainFileName = (StringRef)remapDIPath(MainFileName);
+ llvm::sys::path::native(NativeMainFileName);
+ MainFileName = (std::string)NativeMainFileName.str();
+
+ llvm::DIFile *CUFile =
+ DBuilder.createFile(MainFileName, remapDIPath(getCurrentDirname()),
+ CSInfo, getSource(SM, SM.getMainFileID()));
StringRef Sysroot, SDK;
if (CGM.getCodeGenOpts().getDebuggerTuning() == llvm::DebuggerKind::LLDB) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
