From 4c215c08e3e79c5fc221dd0f6e6ce0c1624f895a Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Tue, 3 Jul 2012 03:59:29 +0000 Subject: [PATCH] MCContext::GetDwarfFile(): Make FileName parsing tolerant of DOSish pathsep with PathV2. It fixes failure in test/MC/MachO/gen-dwarf.s on Win32 w/o bash. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159640 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCContext.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/MC/MCContext.cpp b/lib/MC/MCContext.cpp index d3c4fb1d7ca..b535b3e6e94 100644 --- a/lib/MC/MCContext.cpp +++ b/lib/MC/MCContext.cpp @@ -274,11 +274,11 @@ unsigned MCContext::GetDwarfFile(StringRef Directory, StringRef FileName, if (Directory.empty()) { // Separate the directory part from the basename of the FileName. - std::pair Slash = FileName.rsplit('/'); - Directory = Slash.second; - if (!Directory.empty()) { - Directory = Slash.first; - FileName = Slash.second; + StringRef tFileName = sys::path::filename(FileName); + if (!tFileName.empty()) { + Directory = sys::path::parent_path(FileName); + if (!Directory.empty()) + FileName = sys::path::filename(FileName); } } -- 2.34.1