---

yaml
---
r: 318959
b: refs/heads/master-rebranch
c: 9b1e760
h: refs/heads/master
i:
  318957: f7b5d80
  318955: fdc4896
  318951: 80a001a
  318943: 85b9a5e

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 71ffa2251536a7663cad3854a298a3f4a556205c
+refs/heads/master-rebranch: 9b1e760db4f6d6eb825fd3c6624a848c452070ae

branches/master-rebranch/lib/IRGen/IRGenDebugInfo.cpp

@@ -637,22 +637,25 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     if (Val != DIModuleCache.end())
       return cast<llvm::DIModule>(Val->second);
 
+    std::string RemappedIncludePath = DebugPrefixMap.remapPath(IncludePath);
+
     // For Clang modules / PCH, create a Skeleton CU pointing to the PCM/PCH.
     bool CreateSkeletonCU = !ASTFile.empty();
     bool IsRootModule = !Parent;
     if (CreateSkeletonCU && IsRootModule) {
       llvm::DIBuilder DIB(M);
       DIB.createCompileUnit(IGM.ObjCInterop ? llvm::dwarf::DW_LANG_ObjC
                                             : llvm::dwarf::DW_LANG_C99,
-                            DIB.createFile(Name, IncludePath),
+                            DIB.createFile(Name, RemappedIncludePath),
                             TheCU->getProducer(), true, StringRef(), 0, ASTFile,
                             llvm::DICompileUnit::FullDebug, Signature);
       DIB.finalize();
     }
 
     StringRef Sysroot = IGM.Context.SearchPathOpts.SDKPath;
     llvm::DIModule *M =
-        DBuilder.createModule(Parent, Name, ConfigMacros, IncludePath, Sysroot);
+        DBuilder.createModule(Parent, Name, ConfigMacros, RemappedIncludePath,
+                              Sysroot);
     DIModuleCache.insert({Key, llvm::TrackingMDNodeRef(M)});
     return M;
   }

branches/master-rebranch/stdlib/public/Darwin/Foundation/NSDictionary.swift

@@ -238,7 +238,7 @@ extension Dictionary : _ObjectiveCBridgeable {
       let handleDuplicates = (Key.self == String.self)
 
       result = Dictionary(_unsafeUninitializedCapacity: numElems,
-        allowingDuplicates: handleDuplicates) { (keys, vals, outCount) in
+        allowingDuplicates: handleDuplicates) { keys, vals in
 
         let objectKeys = UnsafeMutableRawPointer(mutating:
           keys.baseAddress!).assumingMemoryBound(to: AnyObject.self)
@@ -253,7 +253,7 @@ extension Dictionary : _ObjectiveCBridgeable {
         _forceBridge(objectKeys, count: numElems, to: Key.self)
         _forceBridge(objectVals, count: numElems, to: Value.self)
 
-        outCount = numElems
+        return numElems
       }
     }
   }
@@ -293,7 +293,7 @@ extension Dictionary : _ObjectiveCBridgeable {
     let handleDuplicates = (Key.self == String.self)
 
     let tmpResult = Dictionary(_unsafeUninitializedCapacity: numElems,
-      allowingDuplicates: handleDuplicates) { (keys, vals, outCount) in
+      allowingDuplicates: handleDuplicates) { keys, vals in
 
       let objectKeys = UnsafeMutableRawPointer(mutating:
         keys.baseAddress!).assumingMemoryBound(to: AnyObject.self)
@@ -314,7 +314,7 @@ extension Dictionary : _ObjectiveCBridgeable {
             Key.self)).deinitialize(count: numElems)
         }
       }
-      outCount = success ? numElems : 0
+      return success ? numElems : 0
     }
 
     result = success ? tmpResult : nil

branches/master-rebranch/stdlib/public/core/DictionaryBuilder.swift

@@ -72,16 +72,14 @@ extension Dictionary {
   ///     closure must return the count of the initialized elements, starting at
   ///     the beginning of the buffer.
   @_alwaysEmitIntoClient // Introduced in 5.1
-  @inlinable
   public // SPI(Foundation)
   init(
     _unsafeUninitializedCapacity capacity: Int,
     allowingDuplicates: Bool,
     initializingWith initializer: (
       _ keys: UnsafeMutableBufferPointer<Key>,
-      _ values: UnsafeMutableBufferPointer<Value>,
-      _ initializedCount: inout Int
-    ) -> Void
+      _ values: UnsafeMutableBufferPointer<Value>
+    ) -> Int
   ) {
     self.init(_native: _NativeDictionary(
         _unsafeUninitializedCapacity: capacity,
@@ -92,23 +90,19 @@ extension Dictionary {
 
 extension _NativeDictionary {
   @_alwaysEmitIntoClient // Introduced in 5.1
-  @inlinable
   internal init(
     _unsafeUninitializedCapacity capacity: Int,
     allowingDuplicates: Bool,
     initializingWith initializer: (
       _ keys: UnsafeMutableBufferPointer<Key>,
-      _ values: UnsafeMutableBufferPointer<Value>,
-      _ initializedCount: inout Int
-    ) -> Void
+      _ values: UnsafeMutableBufferPointer<Value>
+    ) -> Int
   ) {
     self.init(capacity: capacity)
-    var initializedCount = 0
-    initializer(
+    let initializedCount = initializer(
       UnsafeMutableBufferPointer(start: _keys, count: capacity),
-      UnsafeMutableBufferPointer(start: _values, count: capacity),
-      &initializedCount)
-    _precondition(count >= 0 && count <= capacity)
+      UnsafeMutableBufferPointer(start: _values, count: capacity))
+    _precondition(initializedCount >= 0 && initializedCount <= capacity)
     _storage._count = initializedCount
 
     // Hash initialized elements and move each of them into their correct

branches/master-rebranch/test/DebugInfo/debug_prefix_map.swift

@@ -1,7 +1,12 @@
-// RUN: %swiftc_driver -g -debug-prefix-map %/S=/var/empty %/s -emit-ir -o - | %FileCheck %s
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module-path %t/Globals.swiftmodule %S/Globals.swift
+// RUN: %target-swiftc_driver -g -debug-prefix-map %/S=/var/empty -debug-prefix-map %t=/var/empty %/s -I %t -emit-ir -o - | %FileCheck %s
+
+import Globals
 
 func square(_ n: Int) -> Int {
   return n * n
 }
 
 // CHECK: !DIFile(filename: "/var/empty/debug_prefix_map.swift"
+// CHECK: !DIModule(scope: null, name: "Globals", includePath: "/var/empty/Globals.swiftmodule"

branches/master-rebranch/validation-test/stdlib/Dictionary.swift

@@ -5700,14 +5700,14 @@ DictionaryTestSuite.test("BulkLoadingInitializer.Unique") {
     let d1 = Dictionary<TestKeyTy, TestEquatableValueTy>(
       _unsafeUninitializedCapacity: c,
       allowingDuplicates: false
-    ) { keys, values, count in
+    ) { keys, values in
       let k = keys.baseAddress!
       let v = values.baseAddress!
       for i in 0 ..< c {
         (k + i).initialize(to: TestKeyTy(i))
         (v + i).initialize(to: TestEquatableValueTy(i))
-        count += 1
       }
+      return c
     }
 
     let d2 = Dictionary(
@@ -5727,14 +5727,14 @@ DictionaryTestSuite.test("BulkLoadingInitializer.Nonunique") {
     let d1 = Dictionary<TestKeyTy, TestEquatableValueTy>(
       _unsafeUninitializedCapacity: c,
       allowingDuplicates: true
-    ) { keys, values, count in
+    ) { keys, values in
       let k = keys.baseAddress!
       let v = values.baseAddress!
       for i in 0 ..< c {
         (k + i).initialize(to: TestKeyTy(i / 2))
         (v + i).initialize(to: TestEquatableValueTy(i / 2))
-        count += 1
       }
+      return c
     }
 
     let d2 = Dictionary(