---

yaml
---
r: 348901
b: refs/heads/master
c: f2b43e4
h: refs/heads/master
i:
  348899: 5c02690

Author: swift-ci

[refs]

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

trunk/lib/SIL/SILProfiler.cpp

@@ -247,6 +247,11 @@ struct MapRegionCounters : public ASTWalker {
     if (skipExpr(E))
       return {true, E};
 
+    // Profiling for closures should be handled separately. Do not visit
+    // closure expressions twice.
+    if (isa<AbstractClosureExpr>(E) && !Parent.isNull())
+      return {false, E};
+
     // If AST visitation begins with an expression, the counter map must be
     // empty. Set up a counter for the root.
     if (Parent.isNull()) {
@@ -430,6 +435,20 @@ class SourceMappingRegion {
     assert(EndLoc && "Region has no end location");
     return *EndLoc;
   }
+
+  void print(llvm::raw_ostream &OS, const SourceManager &SM) const {
+    OS << "[";
+    if (hasStartLoc())
+      getStartLoc().print(OS, SM);
+    else
+      OS << "?";
+    OS << ", ";
+    if (hasEndLoc())
+      getEndLoc().print(OS, SM);
+    else
+      OS << "?";
+    OS << "]";
+  }
 };
 
 /// An ASTWalker that maps ASTNodes to profiling counters.
@@ -591,6 +610,11 @@ struct PGOMapping : public ASTWalker {
     if (skipExpr(E))
       return {true, E};
 
+    // Profiling for closures should be handled separately. Do not visit
+    // closure expressions twice.
+    if (isa<AbstractClosureExpr>(E) && !Parent.isNull())
+      return {false, E};
+
     unsigned parent = getParentCounter();
 
     if (Parent.isNull()) {
@@ -754,6 +778,11 @@ struct CoverageMapping : public ASTWalker {
   void pushRegion(ASTNode Node) {
     RegionStack.emplace_back(Node, getCounter(Node), Node.getStartLoc(),
                              getEndLoc(Node));
+    LLVM_DEBUG({
+      llvm::dbgs() << "Pushed region: ";
+      RegionStack.back().print(llvm::dbgs(), SM);
+      llvm::dbgs() << "\n";
+    });
   }
 
   /// Replace the current region's count by pushing an incomplete region.
@@ -780,6 +809,8 @@ struct CoverageMapping : public ASTWalker {
     auto ParentIt = I;
     SourceLoc EndLoc = ParentIt->getEndLoc();
 
+    unsigned FirstPoppedIndex = SourceRegions.size();
+    (void)FirstPoppedIndex;
     SourceRegions.push_back(std::move(*I++));
     for (; I != E; ++I) {
       if (!I->hasStartLoc())
@@ -789,6 +820,14 @@ struct CoverageMapping : public ASTWalker {
       SourceRegions.push_back(std::move(*I));
     }
 
+    LLVM_DEBUG({
+      for (unsigned Idx = FirstPoppedIndex; Idx < SourceRegions.size(); ++Idx) {
+        llvm::dbgs() << "Popped region: ";
+        SourceRegions[Idx].print(llvm::dbgs(), SM);
+        llvm::dbgs() << "\n";
+      }
+    });
+
     RegionStack.erase(ParentIt, E);
   }
 
@@ -1017,6 +1056,11 @@ struct CoverageMapping : public ASTWalker {
     if (skipExpr(E))
       return {true, E};
 
+    // Profiling for closures should be handled separately. Do not visit
+    // closure expressions twice.
+    if (isa<AbstractClosureExpr>(E) && !Parent.isNull())
+      return {false, E};
+
     if (!RegionStack.empty())
       extendRegion(E);
 

trunk/test/Profiler/coverage_empty_region_stack1.swift

@@ -0,0 +1,20 @@
+// RUN: %target-swift-frontend -Xllvm -sil-full-demangle -profile-generate -profile-coverage-mapping -emit-sil -module-name coverage_empty %s | %FileCheck %s
+
+// Skip the sil prologue, which reproduces the swift source of this file
+// and confounds FileCheck.
+// CHECK-LABEL: sil @main
+
+func singleDefaultArgument(i: Int = {
+  // CHECK: sil_coverage_map {{.*}}closure #1 () -> Swift.Int in default argument 0
+  // CHECK-NEXT:   [[@LINE-2]]:37 -> [[@LINE+6]]:2 : 0
+  // CHECK-NEXT: }
+  struct SingleDefaultArgumentStruct {
+    let sdasi: Int
+  }
+  return 2
+}()) {
+  // CHECK: sil_coverage_map {{.*}}singleDefaultArgument(i: Swift.Int) -> ()
+  // CHECK-NEXT:   [[@LINE-2]]:6 -> [[@LINE+3]]:2 : 0
+  // CHECK-NEXT: }
+  print(i)
+}

trunk/utils/build-script-impl

@@ -3448,7 +3448,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 if [ "${BUILD_LIBPARSER_ONLY}" ]; then
                     # We don't have a toolchain so we should install to the specified dir
                     DYLIB_DIR="${INSTALL_DESTDIR}"
-                    MODULE_DIR="${INSTALL_DESTDIR}"
+                    MODULE_DIR="${INSTALL_DESTDIR}/${product}.swiftmodule/${SWIFT_HOST_VARIANT_ARCH}"
                     # Create the install dir if it doesn't exist
                     call mkdir -p "${INSTALL_DESTDIR}"
                     # Install libParser is necessary
@@ -3458,14 +3458,14 @@ for host in "${ALL_HOSTS[@]}"; do
                 else
                     # We have a toolchain so install to the toolchain
                     DYLIB_DIR="${host_install_destdir}${host_install_prefix}/lib/swift/${SWIFT_HOST_VARIANT}"
-                    MODULE_DIR="${DYLIB_DIR}/${SWIFT_HOST_VARIANT_ARCH}"
+                    MODULE_DIR="${DYLIB_DIR}/${product}.swiftmodule/${SWIFT_HOST_VARIANT_ARCH}"
                 fi
                 if [[ "${SKIP_SWIFTSYNTAX_SWIFTSIDE}" ]]; then
                     continue
                 fi
                 set_swiftsyntax_build_command
                 if [[ -z "${SKIP_INSTALL_SWIFTSYNTAX_MODULE}" ]] ; then
-                    call "${swiftsyntax_build_command[@]}" --dylib-dir="${DYLIB_DIR}" --swiftmodule-dir "${MODULE_DIR}" --install
+                    call "${swiftsyntax_build_command[@]}" --dylib-dir="${DYLIB_DIR}" --swiftmodule-base-name "${MODULE_DIR}" --install
                 else
                     call "${swiftsyntax_build_command[@]}" --dylib-dir="${DYLIB_DIR}" --install
                 fi