Skip to content

Commit 26e142c

Browse files
dan-zhengdan-zheng
committed
Run git clang-format.
1 parent b566a3d commit 26e142c

15 files changed

+88
-84
lines changed

‎lib/AST/ASTContext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3277,9 +3277,9 @@ SILFunctionType::SILFunctionType(
32773277
"types and substitutions");
32783278

32793279
if (substitutions) {
3280-
assert(substitutions.getGenericSignature().getCanonicalSignature()
3281-
== genericSig.getCanonicalSignature()
3282-
&& "substitutions must match generic signature");
3280+
assert(substitutions.getGenericSignature().getCanonicalSignature() ==
3281+
genericSig.getCanonicalSignature() &&
3282+
"substitutions must match generic signature");
32833283
}
32843284

32853285
if (genericSig) {

‎lib/AST/ASTDemangler.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -865,12 +865,13 @@ CanGenericSignature ASTBuilder::demangleGenericSignature(
865865
}
866866
}
867867

868-
return evaluateOrDefault(
869-
Ctx.evaluator,
870-
AbstractGenericSignatureRequest{
871-
nominalDecl->getGenericSignature().getPointer(), { },
872-
std::move(requirements)},
873-
GenericSignature()).getCanonicalSignature();
868+
return evaluateOrDefault(Ctx.evaluator,
869+
AbstractGenericSignatureRequest{
870+
nominalDecl->getGenericSignature().getPointer(),
871+
{},
872+
std::move(requirements)},
873+
GenericSignature())
874+
.getCanonicalSignature();
874875
}
875876

876877
DeclContext *
@@ -980,8 +981,7 @@ ASTBuilder::findDeclContext(NodePointer node) {
980981
continue;
981982
}
982983

983-
if (ext->getGenericSignature().getCanonicalSignature()
984-
== genericSig) {
984+
if (ext->getGenericSignature().getCanonicalSignature() == genericSig) {
985985
return ext;
986986
}
987987
}

‎lib/AST/GenericSignature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ bool GenericSignatureImpl::isEqual(GenericSignature Other) {
171171
}
172172

173173
bool GenericSignatureImpl::isCanonical() const {
174-
if (CanonicalSignatureOrASTContext.is<ASTContext*>())
174+
if (CanonicalSignatureOrASTContext.is<ASTContext *>())
175175
return true;
176176
return getCanonicalSignature().getPointer() == this;
177177
}

‎lib/IRGen/GenArchetype.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -414,21 +414,22 @@ withOpaqueTypeGenericArgs(IRGenFunction &IGF,
414414
} else {
415415
SmallVector<llvm::Value *, 4> args;
416416
SmallVector<llvm::Type *, 4> types;
417-
417+
418418
enumerateGenericSignatureRequirements(
419-
opaqueDecl->getGenericSignature().getCanonicalSignature(),
420-
[&](GenericRequirement reqt) {
421-
auto ty = reqt.TypeParameter.subst(archetype->getSubstitutions())
422-
->getCanonicalType(opaqueDecl->getGenericSignature());
423-
if (reqt.Protocol) {
424-
auto ref = ProtocolConformanceRef(reqt.Protocol)
425-
.subst(reqt.TypeParameter, archetype->getSubstitutions());
426-
args.push_back(emitWitnessTableRef(IGF, ty, ref));
427-
} else {
428-
args.push_back(IGF.emitAbstractTypeMetadataRef(ty));
429-
}
430-
types.push_back(args.back()->getType());
431-
});
419+
opaqueDecl->getGenericSignature().getCanonicalSignature(),
420+
[&](GenericRequirement reqt) {
421+
auto ty = reqt.TypeParameter.subst(archetype->getSubstitutions())
422+
->getCanonicalType(opaqueDecl->getGenericSignature());
423+
if (reqt.Protocol) {
424+
auto ref =
425+
ProtocolConformanceRef(reqt.Protocol)
426+
.subst(reqt.TypeParameter, archetype->getSubstitutions());
427+
args.push_back(emitWitnessTableRef(IGF, ty, ref));
428+
} else {
429+
args.push_back(IGF.emitAbstractTypeMetadataRef(ty));
430+
}
431+
types.push_back(args.back()->getType());
432+
});
432433
auto bufTy = llvm::StructType::get(IGF.IGM.LLVMContext, types);
433434
alloca = IGF.createAlloca(bufTy, IGF.IGM.getPointerAlignment());
434435
allocaSize = IGF.IGM.getPointerSize() * args.size();

‎lib/IRGen/GenKeyPath.cpp

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -698,9 +698,10 @@ emitKeyPathComponent(IRGenModule &IGM,
698698
loweredBaseTy = IGM.getLoweredType(AbstractionPattern::getOpaque(),
699699
baseTy->getWithoutSpecifierType());
700700
// TODO: Eliminate GenericContextScope entirely
701-
GenericContextScope scope(IGM,
702-
genericEnv ? genericEnv->getGenericSignature().getCanonicalSignature()
703-
: nullptr);
701+
GenericContextScope scope(
702+
IGM, genericEnv
703+
? genericEnv->getGenericSignature().getCanonicalSignature()
704+
: nullptr);
704705
switch (auto kind = component.getKind()) {
705706
case KeyPathPatternComponent::Kind::StoredProperty: {
706707
auto property = cast<VarDecl>(component.getStoredPropertyDecl());
@@ -838,29 +839,28 @@ emitKeyPathComponent(IRGenModule &IGM,
838839
SmallVector<llvm::Constant *, 4> externalSubArgs;
839840
auto componentSig = externalDecl->getInnermostDeclContext()
840841
->getGenericSignatureOfContext();
841-
842+
842843
auto componentCanSig = componentSig.getCanonicalSignature();
843844
auto subs = component.getExternalSubstitutions();
844845
if (!subs.empty()) {
845846
enumerateGenericSignatureRequirements(
846-
componentCanSig,
847-
[&](GenericRequirement reqt) {
848-
auto substType = reqt.TypeParameter.subst(subs)
849-
->getCanonicalType();
850-
if (!reqt.Protocol) {
851-
// Type requirement.
852-
externalSubArgs.push_back(
853-
emitMetadataTypeRefForKeyPath(IGM, substType, componentCanSig));
854-
} else {
855-
// Protocol requirement.
856-
auto conformance = subs.lookupConformance(
857-
reqt.TypeParameter->getCanonicalType(), reqt.Protocol);
858-
externalSubArgs.push_back(IGM.emitWitnessTableRefString(
859-
substType, conformance,
860-
genericEnv ? genericEnv->getGenericSignature() : nullptr,
861-
/*shouldSetLowBit*/ true));
862-
}
863-
});
847+
componentCanSig, [&](GenericRequirement reqt) {
848+
auto substType =
849+
reqt.TypeParameter.subst(subs)->getCanonicalType();
850+
if (!reqt.Protocol) {
851+
// Type requirement.
852+
externalSubArgs.push_back(emitMetadataTypeRefForKeyPath(
853+
IGM, substType, componentCanSig));
854+
} else {
855+
// Protocol requirement.
856+
auto conformance = subs.lookupConformance(
857+
reqt.TypeParameter->getCanonicalType(), reqt.Protocol);
858+
externalSubArgs.push_back(IGM.emitWitnessTableRefString(
859+
substType, conformance,
860+
genericEnv ? genericEnv->getGenericSignature() : nullptr,
861+
/*shouldSetLowBit*/ true));
862+
}
863+
});
864864
}
865865
fields.addInt32(
866866
KeyPathComponentHeader::forExternalComponent(externalSubArgs.size())
@@ -1331,9 +1331,10 @@ void IRGenModule::emitSILProperty(SILProperty *prop) {
13311331
SmallVector<GenericRequirement, 4> requirements;
13321332
CanGenericSignature genericSig;
13331333
if (genericEnv) {
1334-
genericSig = prop->getDecl()->getInnermostDeclContext()
1335-
->getGenericSignatureOfContext()
1336-
.getCanonicalSignature();
1334+
genericSig = prop->getDecl()
1335+
->getInnermostDeclContext()
1336+
->getGenericSignatureOfContext()
1337+
.getCanonicalSignature();
13371338
enumerateGenericSignatureRequirements(genericSig,
13381339
[&](GenericRequirement reqt) { requirements.push_back(reqt); });
13391340
}

‎lib/IRGen/GenMeta.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ namespace {
16861686
auto underlyingType = Type(O->getUnderlyingInterfaceType())
16871687
.subst(*O->getUnderlyingTypeSubstitutions())
16881688
->getCanonicalType(sig);
1689-
1689+
16901690
auto contextSig = O->getGenericSignature().getCanonicalSignature();
16911691

16921692
B.addRelativeAddress(IGM.getTypeRef(underlyingType, contextSig,

‎lib/IRGen/GenProto.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3030,7 +3030,7 @@ void GenericTypeRequirements::emitInitOfBuffer(IRGenFunction &IGF,
30303030
if (Requirements.empty()) return;
30313031

30323032
auto generics =
3033-
TheDecl->getGenericSignatureOfContext().getCanonicalSignature();
3033+
TheDecl->getGenericSignatureOfContext().getCanonicalSignature();
30343034
auto &module = *TheDecl->getParentModule();
30353035
emitInitOfGenericRequirementsBuffer(IGF, Requirements, buffer,
30363036
[&](GenericRequirement requirement) {

‎lib/ParseSIL/ParseSIL.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5739,9 +5739,10 @@ bool SILParserTUState::parseSILProperty(Parser &P) {
57395739
patternEnv = handleSILGenericParams(generics, &P.SF);
57405740

57415741
if (patternEnv) {
5742-
if (patternEnv->getGenericSignature().getCanonicalSignature()
5743-
!= VD->getInnermostDeclContext()->getGenericSignatureOfContext()
5744-
.getCanonicalSignature()) {
5742+
if (patternEnv->getGenericSignature().getCanonicalSignature() !=
5743+
VD->getInnermostDeclContext()
5744+
->getGenericSignatureOfContext()
5745+
.getCanonicalSignature()) {
57455746
P.diagnose(loc, diag::sil_property_generic_signature_mismatch);
57465747
return true;
57475748
}

‎lib/PrintAsObjC/DeclAndTypePrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,7 @@ class DeclAndTypePrinter::Implementation
18821882
extendedClass->getGenericParams()->size() &&
18831883
"extensions with custom generic parameters?");
18841884
assert(extension->getGenericSignature().getCanonicalSignature() ==
1885-
extendedClass->getGenericSignature().getCanonicalSignature() &&
1885+
extendedClass->getGenericSignature().getCanonicalSignature() &&
18861886
"constrained extensions or custom generic parameters?");
18871887
type = extendedClass->getGenericEnvironment()->getSugaredType(type);
18881888
decl = type->getDecl();

‎lib/SIL/SILFunctionType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ static CanSILFunctionType getSILFunctionType(
12781278
if (!subst.substGenericParams.empty()) {
12791279
genericSig = GenericSignature::get(subst.substGenericParams,
12801280
subst.substRequirements)
1281-
.getCanonicalSignature();
1281+
.getCanonicalSignature();
12821282
substitutions = SubstitutionMap::get(genericSig,
12831283
subst.substReplacements,
12841284
ArrayRef<ProtocolConformanceRef>());

‎lib/SILGen/ResultPlan.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ mapTypeOutOfOpenedExistentialContext(CanType t) {
105105
MakeAbstractConformanceForGenericType());
106106

107107
return std::make_tuple(mappedTy->getCanonicalType(mappedSig),
108-
mappedSig.getCanonicalSignature(),
109-
mappedSubs);
108+
mappedSig.getCanonicalSignature(), mappedSubs);
110109
}
111110

112111
/// A result plan for an indirectly-returned opened existential value.
@@ -149,11 +148,11 @@ class IndirectOpenedSelfResultPlan final : public ResultPlan {
149148
SubstitutionMap layoutSubs;
150149
std::tie(layoutTy, layoutSig, layoutSubs)
151150
= mapTypeOutOfOpenedExistentialContext(resultTy);
152-
153-
auto boxLayout = SILLayout::get(SGF.getASTContext(),
154-
layoutSig.getCanonicalSignature(),
155-
SILField(layoutTy->getCanonicalType(layoutSig), true));
156-
151+
152+
auto boxLayout =
153+
SILLayout::get(SGF.getASTContext(), layoutSig.getCanonicalSignature(),
154+
SILField(layoutTy->getCanonicalType(layoutSig), true));
155+
157156
resultBox = SGF.B.createAllocBox(loc,
158157
SILBoxType::get(SGF.getASTContext(),
159158
boxLayout,

‎lib/SILGen/SILGenExpr.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2650,9 +2650,9 @@ static SILFunction *getOrCreateKeyPathGetter(SILGenModule &SGM,
26502650
}
26512651
}
26522652

2653-
auto genericSig = genericEnv
2654-
? genericEnv->getGenericSignature().getCanonicalSignature()
2655-
: nullptr;
2653+
auto genericSig =
2654+
genericEnv ? genericEnv->getGenericSignature().getCanonicalSignature()
2655+
: nullptr;
26562656
if (genericSig && genericSig->areAllParamsConcrete()) {
26572657
genericSig = nullptr;
26582658
genericEnv = nullptr;
@@ -2782,9 +2782,9 @@ static SILFunction *getOrCreateKeyPathSetter(SILGenModule &SGM,
27822782
}
27832783
}
27842784

2785-
auto genericSig = genericEnv
2786-
? genericEnv->getGenericSignature().getCanonicalSignature()
2787-
: nullptr;
2785+
auto genericSig =
2786+
genericEnv ? genericEnv->getGenericSignature().getCanonicalSignature()
2787+
: nullptr;
27882788
if (genericSig && genericSig->areAllParamsConcrete()) {
27892789
genericSig = nullptr;
27902790
genericEnv = nullptr;
@@ -2943,10 +2943,10 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
29432943
hash = nullptr;
29442944
return;
29452945
}
2946-
2947-
auto genericSig = genericEnv
2948-
? genericEnv->getGenericSignature().getCanonicalSignature()
2949-
: nullptr;
2946+
2947+
auto genericSig =
2948+
genericEnv ? genericEnv->getGenericSignature().getCanonicalSignature()
2949+
: nullptr;
29502950

29512951
if (genericSig && genericSig->areAllParamsConcrete()) {
29522952
genericSig = nullptr;

‎lib/Sema/TypeCheckType.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,7 +2737,7 @@ Type TypeResolver::resolveSILBoxType(SILBoxTypeRepr *repr,
27372737
CanGenericSignature genericSig;
27382738
if (auto *genericEnv = repr->getGenericEnvironment()) {
27392739
genericSig = genericEnv->getGenericSignature().getCanonicalSignature();
2740-
2740+
27412741
for (auto &field : fields) {
27422742
auto transTy = field.getLoweredType()->mapTypeOutOfContext();
27432743
field = {transTy->getCanonicalType(), field.isMutable()};
@@ -2841,7 +2841,8 @@ Type TypeResolver::resolveSILFunctionType(FunctionTypeRepr *repr,
28412841
// Resolve substitutions if we have them.
28422842
SubstitutionMap subs;
28432843
if (!repr->getSubstitutions().empty()) {
2844-
auto sig = repr->getGenericEnvironment()->getGenericSignature()
2844+
auto sig = repr->getGenericEnvironment()
2845+
->getGenericSignature()
28452846
.getCanonicalSignature();
28462847
TypeSubstitutionMap subsMap;
28472848
auto params = sig->getGenericParams();
@@ -2866,7 +2867,7 @@ Type TypeResolver::resolveSILFunctionType(FunctionTypeRepr *repr,
28662867
Optional<SILResultInfo> interfaceErrorResult;
28672868
if (auto *genericEnv = repr->getGenericEnvironment()) {
28682869
genericSig = genericEnv->getGenericSignature().getCanonicalSignature();
2869-
2870+
28702871
for (auto &param : params) {
28712872
auto transParamType = param.getInterfaceType()->mapTypeOutOfContext()
28722873
->getCanonicalType();

‎lib/Serialization/Deserialization.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,9 @@ static void filterValues(Type expectedTy, ModuleDecl *expectedModule,
11741174
// If we're expecting a member within a constrained extension with a
11751175
// particular generic signature, match that signature.
11761176
if (expectedGenericSig &&
1177-
value->getDeclContext()->getGenericSignatureOfContext()
1178-
.getCanonicalSignature() != expectedGenericSig)
1177+
value->getDeclContext()
1178+
->getGenericSignatureOfContext()
1179+
.getCanonicalSignature() != expectedGenericSig)
11791180
return true;
11801181

11811182
// If we don't expect a specific generic signature, ignore anything from a
@@ -1638,8 +1639,8 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
16381639
// correct generic signature.
16391640
for (auto ext : nominal->getExtensions()) {
16401641
if (ext->getModuleContext() == M &&
1641-
ext->getGenericSignature().getCanonicalSignature()
1642-
== genericSig) {
1642+
ext->getGenericSignature().getCanonicalSignature() ==
1643+
genericSig) {
16431644
currentSig = ext->getGenericSignature();
16441645
break;
16451646
}

‎lib/Serialization/DeserializeSIL.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,8 +2521,8 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
25212521
CanGenericSignature sig = CanGenericSignature();
25222522
if (!genericParams.empty() || !requirements.empty())
25232523
sig = GenericSignature::get(genericParams, requirements)
2524-
.getCanonicalSignature();
2525-
2524+
.getCanonicalSignature();
2525+
25262526
auto pattern = KeyPathPattern::get(SILMod, sig,
25272527
rootTy->getCanonicalType(),
25282528
valueTy->getCanonicalType(),

0 commit comments

Comments
 (0)