Skip to content

Commit 1fa8ecf

Browse files
authored
Merge pull request #36660 from kavon/fix-ci
fix broken merge
2 parents d0879b9 + 1a370d0 commit 1fa8ecf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/ClangImporter/ImportDecl.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7585,8 +7585,8 @@ SwiftDeclConverter::makeSubscript(FuncDecl *getter, FuncDecl *setter) {
75857585
subscript,
75867586
SourceLoc(),
75877587
subscript->getStaticSpelling(),
7588-
false,
7589-
SourceLoc(),
7588+
/*async*/ false, SourceLoc(),
7589+
/*throws*/ false, SourceLoc(),
75907590
nullptr,
75917591
bodyParams,
75927592
elementTy,
@@ -7621,8 +7621,8 @@ SwiftDeclConverter::makeSubscript(FuncDecl *getter, FuncDecl *setter) {
76217621
subscript,
76227622
SourceLoc(),
76237623
subscript->getStaticSpelling(),
7624-
false,
7625-
SourceLoc(),
7624+
/*async*/ false, SourceLoc(),
7625+
/*throws*/ false, SourceLoc(),
76267626
nullptr,
76277627
setterParamList,
76287628
TupleType::getEmpty(ctx),

0 commit comments

Comments
 (0)