Skip to content

Commit f66beff

Browse files
committed
Fix unittest compile error
1 parent b663a15 commit f66beff

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

docs/ABI/Mangling.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -710,9 +710,9 @@ Types
710710
type ::= type 'Xm' METATYPE-REPR // existential metatype with representation
711711
type ::= 'Xe' // error or unresolved type
712712

713-
#if SWIFT_RUNTIME_VERSION >= 6.TBD
714-
type ::= '$' 'n'? NATURAL_ZERO // integer type
715-
#endif
713+
#if SWIFT_RUNTIME_VERSION >= 6.TBD
714+
type ::= '$' 'n'? NATURAL_ZERO // integer type
715+
#endif
716716

717717
bound-generic-type ::= type 'y' (type* '_')* type* retroactive-conformance* 'G' // one type-list per nesting level of type
718718
bound-generic-type ::= substitution

include/swift/ABI/GenericContext.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ class TargetGenericRequirementDescriptor {
161161
uint16_t GenericParamIndex;
162162
InvertibleProtocolSet Protocols;
163163
} InvertedProtocols;
164-
165-
/// FIXME ALEX DOCS
166-
uint32_t ValueType;
167164
};
168165

169166
constexpr GenericRequirementFlags getFlags() const {

unittests/AST/ASTDumperTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TEST(ASTDumper, ArchetypeType) {
3535
llvm::SmallVector<ProtocolDecl *> protocols;
3636
archetype = PrimaryArchetypeType::getNew(ctx, sig.getGenericEnvironment(),
3737
genericParamTy, protocols, Type(),
38-
nullptr);
38+
nullptr, Type());
3939
}
4040

4141
std::string fullStr;

0 commit comments

Comments
 (0)