Skip to content
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

[generate-type-forwarders] Fix incorrect overrides on methods and properties #10978

Merged
merged 1 commit into from
Mar 26, 2021
+2 −2
Merged

[generate-type-forwarders] Fix incorrect overrides on methods and properties #10978

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
4 changes: 2 additions & 2 deletions src/generate-type-forwarders/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static void EmitPNSE (StringBuilder sb, MethodDefinition method, int indent, boo
if (method.IsAbstract && !method.DeclaringType.IsInterface)
sb.Append ("abstract ");
if (method.IsVirtual && !method.DeclaringType.IsInterface && !method.IsFinal && !method.IsAbstract) {
if (AnyMethodWithSignatureInHierarchy (method.DeclaringType.BaseType?.Resolve (), method, out var matchingMethod) && matchingMethod.IsVirtual) {
if (!method.IsNewSlot && AnyMethodWithSignatureInHierarchy (method.DeclaringType.BaseType?.Resolve (), method, out var matchingMethod) && matchingMethod.IsVirtual) {
sb.Append ("override ");
} else {
sb.Append ("virtual ");
Expand Down Expand Up @@ -476,7 +476,7 @@ static void EmitProperty (StringBuilder sb, PropertyDefinition pd, int indent)
sb.Append ("new ");
} else if (m.IsVirtual && !implicit_interface) {
if (HasPropertyInTypeHierarchy (pd.DeclaringType, m, out var valid)) {
if (valid) {
if (!m.IsNewSlot && valid) {
sb.Append ("override ");
} else {
sb.Append ("new virtual ");
Expand Down