mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.12.0.220

Browse Source 
Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-04-24 09:31:23 +00:00
parent 8bd104cef2
commit 8fc30896db
1200 changed files with 29534 additions and 26161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mcs/ilasm/codegen/MethodDef.cs
View File

@@ -512,9 +512,6 @@ namespace Mono.ILASM {
meth_attr &= ~PEAPI.MethAttr.Abstract;
meth_attr |= PEAPI.MethAttr.Static;
} else {
if ((inst_list.Count > 0) && type_def.IsInterface && !IsStatic)
Report.Error (start, "Method cannot have body if it is non-static declared in an interface");
if (IsAbstract) {
if (!type_def.IsAbstract)
Report.Error (start, String.Format ("Abstract method '{0}' in non-abstract class '{1}'",

6
mcs/ilasm/codegen/TypeDef.cs
View File

@@ -207,9 +207,9 @@ namespace Mono.ILASM {
public void AddMethodDef (MethodDef methoddef)
{
if (IsInterface && !methoddef.IsStatic && (!methoddef.IsVirtual || !methoddef.IsAbstract)) {
Report.Warning (methoddef.StartLocation, "Non-virtual or non-abstract instance method in interface, set to such");
methoddef.Attributes |= PEAPI.MethAttr.Abstract | PEAPI.MethAttr.Virtual;
if (IsInterface && !methoddef.IsStatic && !methoddef.IsVirtual) {
Report.Warning (methoddef.StartLocation, "Non-virtual instance method in interface, set to such");
methoddef.Attributes |= PEAPI.MethAttr.Virtual;
}
if (method_table [methoddef.Signature] != null)