[Constraint system] Minor fixes / test updates for function builders.

Author: DougGregor

lib/Sema/CSApply.cpp

@@ -7261,7 +7261,7 @@ llvm::PointerUnion<Expr *, Stmt *> ConstraintSystem::applySolutionImpl(
        singleExpr->getStartLoc(), singleExpr, /*implicit=*/true);
     auto braceStmt = BraceStmt::create(
         ctx, returnStmt->getStartLoc(), ASTNode(returnStmt),
-        returnStmt->getEndLoc(), /*implicit=*/true);
+        returnStmt->getEndLoc(), /*implicit=*/false);
     result = braceStmt;
   }
 

test/IDE/complete_function_builder.swift

@@ -51,14 +51,14 @@ let globalStringVal: String = ""
 func testAcceptColorTagged(paramIntVal: Int, paramStringVal: String) {
 
   let taggedValue = paramIntVal.tag(Color.red)
-  
+
   acceptColorTagged { color in
     #^IN_CLOSURE_TOP^#
 // IN_CLOSURE_TOP_CONTEXT: Begin completions
-// IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local:               taggedValue[#Tagged<Color, Int>#]; name=taggedValue
+// IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local{{.*}}:               taggedValue[#Tagged<Color, Int>#]; name=taggedValue
 // IN_CLOSURE_TOP-DAG: Decl[GlobalVar]/CurrModule:         globalIntVal[#Int#]; name=globalIntVal
 // IN_CLOSURE_TOP-DAG: Decl[GlobalVar]/CurrModule:         globalStringVal[#String#]; name=globalStringVal
-// IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local:               color; name=color
+// IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local:               color{{.*}}; name=color
 // IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local:               paramIntVal[#Int#]; name=paramIntVal
 // IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local:               paramStringVal[#String#]; name=paramStringVal
 // IN_CLOSURE_TOP: End completions

test/Profiler/coverage_function_builder.swift

@@ -13,15 +13,15 @@ struct Summer {
 // CHECK-LABEL: sil_coverage_map {{.*}} "$s24coverage_functon_builder5test0SiyF"
 @Summer
 func test0() -> Int {
-  // CHECK: [[@LINE-1]]:21 -> [[@LINE+3]]:2 : 0
+  // CHECK: [[@LINE-1]]:21 -> [[@LINE+2]]:5 : 0
   18
   12
 }
 
 // CHECK-LABEL: sil_coverage_map {{.*}} "$s24coverage_functon_builder5test1SiyF"
 @Summer
 func test1() -> Int {
-  // CHECK: [[@LINE-1]]:21 -> [[@LINE+7]]:2 : 0
+  // CHECK: [[@LINE-1]]:21 -> [[@LINE+6]]:4 : 0
   18
   12
   if 7 < 23 {