---

yaml
---
r: 345471
b: refs/heads/master
c: daeac07
h: refs/heads/master
i:
  345469: 732a15b
  345467: 8593ad0
  345463: 5dc7bc2
  345455: 700a8be
  345439: 8b16ccb
  345407: 38fbbe9
  345343: 1a56c79

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c48d98ee9f7cc1e6116a86fbe98e00be0de72e49
+refs/heads/master: daeac073a25e053344cffcc2ba6b7fbef3f4e8da
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/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));
 

trunk/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)
+  }
+}
+