Skip to content

Commit e7006a9

Browse files
committed
Clean up some trivially true condition clauses
ProtocolConformanceRef::isConcrete checks the invalid bit for us.
1 parent 4f84c2a commit e7006a9

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

lib/IDE/CodeCompletion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
21072107
auto *Module = NTD->getParentModule();
21082108
auto Conformance = Module->lookupConformance(
21092109
BaseTy, ATD->getProtocol());
2110-
if (!Conformance.isInvalid() && Conformance.isConcrete()) {
2110+
if (Conformance.isConcrete()) {
21112111
return Conformance.getConcrete()->getTypeWitness(
21122112
const_cast<AssociatedTypeDecl *>(ATD));
21132113
}

lib/ParseSIL/ParseSIL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6322,7 +6322,7 @@ bool SILParserTUState::parseSILWitnessTable(Parser &P) {
63226322

63236323
// FIXME: should we really allow a specialized or inherited conformance here?
63246324
RootProtocolConformance *theConformance = nullptr;
6325-
if (!conf.isInvalid() && conf.isConcrete())
6325+
if (conf.isConcrete())
63266326
theConformance = conf.getConcrete()->getRootConformance();
63276327

63286328
SILWitnessTable *wt = nullptr;

lib/SILGen/SILGen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ ProtocolConformance *SILGenModule::getNSErrorConformanceToError() {
352352
SwiftModule->lookupConformance(nsError->getDeclaredInterfaceType(),
353353
cast<ProtocolDecl>(error));
354354

355-
if (!conformance.isInvalid() && conformance.isConcrete())
355+
if (conformance.isConcrete())
356356
NSErrorConformanceToError = conformance.getConcrete();
357357
else
358358
NSErrorConformanceToError = nullptr;

lib/Sema/CSApply.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ namespace {
436436
TypeChecker::conformsToProtocol(
437437
baseTy, proto, cs.DC,
438438
ConformanceCheckFlags::InExpression);
439-
if (!conformance.isInvalid() && conformance.isConcrete()) {
439+
if (conformance.isConcrete()) {
440440
if (auto witness =
441441
conformance.getConcrete()->getWitnessDecl(decl)) {
442442
// Hack up an AST that we can type-check (independently) to get

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3043,7 +3043,7 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
30433043
auto derivableProto = cast<ProtocolDecl>(derivable->getDeclContext());
30443044
auto conformance =
30453045
TypeChecker::conformsToProtocol(Adoptee, derivableProto, DC, None);
3046-
if (!conformance.isInvalid() && conformance.isConcrete()) {
3046+
if (conformance.isConcrete()) {
30473047
(void)conformance.getConcrete()->getWitnessDecl(derivable);
30483048
}
30493049
}

lib/Sema/TypeCheckType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ static void maybeDiagnoseBadConformanceRef(DeclContext *dc,
898898
(ConformanceCheckFlags::InExpression |
899899
ConformanceCheckFlags::SuppressDependencyTracking |
900900
ConformanceCheckFlags::SkipConditionalRequirements));
901-
if (!conformanceRef.isInvalid() && conformanceRef.isConcrete())
901+
if (conformanceRef.isConcrete())
902902
conformance = conformanceRef.getConcrete();
903903
}
904904

0 commit comments

Comments
 (0)