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

This commit is contained in:
Doug Gregor
2020-01-09 16:33:13 -08:00
parent 5b320992ea
commit 142b3ad538
3 changed files with 6 additions and 6 deletions

View File

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

View File

@@ -55,10 +55,10 @@ func testAcceptColorTagged(paramIntVal: Int, paramStringVal: String) {
acceptColorTagged { color in acceptColorTagged { color in
#^IN_CLOSURE_TOP^# #^IN_CLOSURE_TOP^#
// IN_CLOSURE_TOP_CONTEXT: Begin completions // 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: globalIntVal[#Int#]; name=globalIntVal
// IN_CLOSURE_TOP-DAG: Decl[GlobalVar]/CurrModule: globalStringVal[#String#]; name=globalStringVal // 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: paramIntVal[#Int#]; name=paramIntVal
// IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local: paramStringVal[#String#]; name=paramStringVal // IN_CLOSURE_TOP-DAG: Decl[LocalVar]/Local: paramStringVal[#String#]; name=paramStringVal
// IN_CLOSURE_TOP: End completions // IN_CLOSURE_TOP: End completions

View File

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