Merge pull request #19726 from adrian-prantl/43439465

Author: swift-ci

lib/IRGen/IRGenDebugInfo.cpp

@@ -361,6 +361,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     StringRef File = llvm::sys::path::filename(Filename);
     llvm::SmallString<512> Path(Filename);
     llvm::sys::path::remove_filename(Path);
+    llvm::sys::path::remove_dots(Path);
     llvm::DIFile *F = DBuilder.createFile(DebugPrefixMap.remapPath(File),
                                           DebugPrefixMap.remapPath(Path));
 

test/DebugInfo/ClangPathDots.swift

@@ -0,0 +1,21 @@
+// REQUIRES: objc_interop
+// RUN: rm -rf %t.cache
+// RUN: %target-swift-frontend -emit-ir %s -g -I %S/Inputs -o - \
+// RUN:   -module-cache-path %t.cache | %FileCheck %s --check-prefix=FIRST
+// RUN: %target-swift-frontend -emit-ir %s -g -I %S/Inputs -o - \
+// RUN:   -module-cache-path %t.cache | %FileCheck %s --check-prefix=CACHED
+
+// FIRST: !DIFile(filename: "NSObject.h", directory: {{.*}}/include/objc")
+// CACHED: !DIFile(filename: "NSObject.h", directory: {{.*}}/include/objc")
+
+import ObjectiveC
+
+extension NSObject : CVarArg {
+  /// Transform `self` into a series of machine words that can be
+  /// appropriately interpreted by C varargs
+  public var _cVarArgEncoding: [Int] {
+    _autorelease(self)
+    return _encodeBitsAsWords(self)
+  }
+}
+