Skip to content

[cxx-interop][NFC] Remove some redundant semicolons in a test #86108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xazax-hun merged 1 commit into from
Dec 17, 2025
+22 −22
Merged

[cxx-interop][NFC] Remove some redundant semicolons in a test #86108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions test/Interop/Cxx/foreign-reference/Inputs/inheritance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ struct __attribute__((swift_attr("import_reference")))
__attribute__((swift_attr("retain:immortal")))
__attribute__((swift_attr("release:immortal"))) ImmortalRefType {};

ImmortalRefType *returnImmortalRefType() { return new ImmortalRefType(); };
ImmortalRefType *returnImmortalRefType() { return new ImmortalRefType(); }

struct DerivedFromImmortalRefType : ImmortalRefType {};
DerivedFromImmortalRefType *returnDerivedFromImmortalRefType() { // expected-note {{annotate 'returnDerivedFromImmortalRefType()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
Expand Down Expand Up @@ -151,13 +151,13 @@ DerivedFromRefTypeAndAnnotated *returnDerivedFromRefTypeAndAnnotated() { // expe
}
} // namespace ExplicitAnnotationHasPrecedence1

void ret1(ExplicitAnnotationHasPrecedence1::RefType *v) {};
void rel1(ExplicitAnnotationHasPrecedence1::RefType *v) {};
void ret1(ExplicitAnnotationHasPrecedence1::RefType *v) {}
void rel1(ExplicitAnnotationHasPrecedence1::RefType *v) {}

void ret2(
ExplicitAnnotationHasPrecedence1::DerivedFromValueTypeAndAnnotated *v) {};
ExplicitAnnotationHasPrecedence1::DerivedFromValueTypeAndAnnotated *v) {}
void rel2(
ExplicitAnnotationHasPrecedence1::DerivedFromValueTypeAndAnnotated *v) {};
ExplicitAnnotationHasPrecedence1::DerivedFromValueTypeAndAnnotated *v) {}

void ret3(ExplicitAnnotationHasPrecedence1::DerivedFromRefTypeAndAnnotated *v) {
};
Expand Down Expand Up @@ -189,24 +189,24 @@ DerivedFromRefTypeAAndBAnnotated *returnDerivedFromRefTypeAAndBAnnotated() { //
}
} // namespace ExplicitAnnotationHasPrecedence2

void retain_A(ExplicitAnnotationHasPrecedence2::RefTypeA *v) {};
void release_A(ExplicitAnnotationHasPrecedence2::RefTypeA *v) {};
void retain_B(ExplicitAnnotationHasPrecedence2::RefTypeB *v) {};
void release_B(ExplicitAnnotationHasPrecedence2::RefTypeB *v) {};
void retain_A(ExplicitAnnotationHasPrecedence2::RefTypeA *v) {}
void release_A(ExplicitAnnotationHasPrecedence2::RefTypeA *v) {}
void retain_B(ExplicitAnnotationHasPrecedence2::RefTypeB *v) {}
void release_B(ExplicitAnnotationHasPrecedence2::RefTypeB *v) {}
void retain_C(
ExplicitAnnotationHasPrecedence2::DerivedFromRefTypeAAndBAnnotated *v) {};
ExplicitAnnotationHasPrecedence2::DerivedFromRefTypeAAndBAnnotated *v) {}
void release_C(
ExplicitAnnotationHasPrecedence2::DerivedFromRefTypeAAndBAnnotated *v) {};
ExplicitAnnotationHasPrecedence2::DerivedFromRefTypeAAndBAnnotated *v) {}

namespace BasicInheritanceExample {
struct ValueType {};
ValueType *returnValueType() { return new ValueType(); };
ValueType *returnValueType() { return new ValueType(); }

struct __attribute__((swift_attr("import_reference")))
__attribute__((swift_attr("retain:RCRetain")))
__attribute__((swift_attr("release:RCRelease"))) RefType {};

RefType *returnRefType() { return new RefType(); }; // expected-note {{annotate 'returnRefType()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
RefType *returnRefType() { return new RefType(); } // expected-note {{annotate 'returnRefType()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}

struct DerivedFromRefType final : RefType {};
DerivedFromRefType *returnDerivedFromRefType() { // expected-note {{annotate 'returnDerivedFromRefType()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
Expand Down Expand Up @@ -261,7 +261,7 @@ __attribute__((swift_attr("retain:bRetain3")))
__attribute__((swift_attr("release:bRelease3"))) B3 {};

struct D : B1, B2, B3 {}; // expected-warning {{unable to infer SWIFT_SHARED_REFERENCE for 'D', although one of its transitive base types is marked as SWIFT_SHARED_REFERENCE}}
D *returnD() { return new D(); };
D *returnD() { return new D(); }
} // namespace MultipleInheritanceExample2

void bRetain1(MultipleInheritanceExample2::B1 *v) {}
Expand Down Expand Up @@ -335,18 +335,18 @@ struct B : A {};
struct C : A {};

struct Diamond : B, C {}; // expected-warning {{unable to infer SWIFT_SHARED_REFERENCE for 'Diamond', although one of its transitive base types is marked as SWIFT_SHARED_REFERENCE}}
Diamond *returnDiamond() { return new Diamond(); };
Diamond *returnDiamond() { return new Diamond(); }

struct BVirtual : virtual A {};

struct CVirtual : virtual A {};

struct VirtualDiamond : BVirtual, CVirtual {};
VirtualDiamond *returnVirtualDiamond() { return new VirtualDiamond(); }; // expected-note {{annotate 'returnVirtualDiamond()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
VirtualDiamond *returnVirtualDiamond() { return new VirtualDiamond(); } // expected-note {{annotate 'returnVirtualDiamond()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
} // namespace RefTypeDiamondInheritance

void retainA(RefTypeDiamondInheritance::A *a) {};
void releaseA(RefTypeDiamondInheritance::A *a) {};
void retainA(RefTypeDiamondInheritance::A *a) {}
void releaseA(RefTypeDiamondInheritance::A *a) {}

namespace NonRefTypeDiamondInheritance {
struct A {};
Expand All @@ -358,12 +358,12 @@ __attribute__((swift_attr("release:releaseB"))) B : A {};
struct C : A {};

struct Diamond : B, C {};
Diamond *returnDiamond() { return new Diamond(); }; // expected-note {{annotate 'returnDiamond()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
Diamond *returnDiamond() { return new Diamond(); } // expected-note {{annotate 'returnDiamond()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}

} // namespace NonRefTypeDiamondInheritance

void retainB(NonRefTypeDiamondInheritance::B *a) {};
void releaseB(NonRefTypeDiamondInheritance::B *a) {};
void retainB(NonRefTypeDiamondInheritance::B *a) {}
void releaseB(NonRefTypeDiamondInheritance::B *a) {}

namespace InheritingTemplatedRefType {

Expand All @@ -387,7 +387,7 @@ __attribute__((swift_attr("retain:forestRetain"))) __attribute__((
};

class Forest : public IntrusiveRefCountedTemplate<Forest> {};
Forest *returnForest() { return new Forest(); }; // expected-note {{annotate 'returnForest()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
Forest *returnForest() { return new Forest(); } // expected-note {{annotate 'returnForest()' with either SWIFT_RETURNS_RETAINED or SWIFT_RETURNS_UNRETAINED}}
} // namespace InheritingTemplatedRefType

void forestRetain(InheritingTemplatedRefType::IntrusiveRefCountedTemplate<
Expand Down