Skip to content

Commit 07a40dc

Browse files
authored
Merge pull request swiftlang#68721 from tshortli/fix-warnings
2 parents 5a2465e + 51a4ff9 commit 07a40dc

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

lib/AST/Decl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6755,8 +6755,8 @@ void AbstractStorageDecl::AccessorRecord::removeAccessor(
67556755
) {
67566756
// Remove this accessor from the list of accessors.
67576757
assert(getAccessor(accessor->getAccessorKind()) == accessor);
6758-
std::remove(getAccessorsBuffer().begin(), getAccessorsBuffer().end(),
6759-
accessor);
6758+
(void)std::remove(getAccessorsBuffer().begin(), getAccessorsBuffer().end(),
6759+
accessor);
67606760

67616761
// Clear out the accessor kind -> index mapping.
67626762
std::memset(AccessorIndices, 0, sizeof(AccessorIndices));

lib/Sema/CSSimplify.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2938,23 +2938,6 @@ bool ConstraintSystem::hasPreconcurrencyCallee(
29382938
return calleeOverload->choice.getDecl()->preconcurrency();
29392939
}
29402940

2941-
/// Determines whether a DeclContext is preconcurrency, using information
2942-
/// tracked by the solver to aid in answering that.
2943-
static bool isPreconcurrency(ConstraintSystem &cs, DeclContext *dc) {
2944-
if (auto *decl = dc->getAsDecl())
2945-
return decl->preconcurrency();
2946-
2947-
if (auto *ce = dyn_cast<ClosureExpr>(dc)) {
2948-
return ClosureIsolatedByPreconcurrency{cs}(ce);
2949-
}
2950-
2951-
if (auto *autoClos = dyn_cast<AutoClosureExpr>(dc)) {
2952-
return isPreconcurrency(cs, autoClos->getParent());
2953-
}
2954-
2955-
llvm_unreachable("unhandled DeclContext kind in isPreconcurrency");
2956-
}
2957-
29582941
ConstraintSystem::TypeMatchResult
29592942
ConstraintSystem::matchFunctionTypes(FunctionType *func1, FunctionType *func2,
29602943
ConstraintKind kind, TypeMatchOptions flags,

0 commit comments

Comments
 (0)