Revert until fixed

[mono.git] / mcs / mcs / decl.cs

diff --git a/mcs/mcs/decl.cs b/mcs/mcs/decl.cs
index 4f16835d2dad207999d2bd100439289c27ffabd3..86a186a16ccfe20d23b8e94bc84b758962edd3e8 100644 (file)
--- a/mcs/mcs/decl.cs
+++ b/mcs/mcs/decl.cs
@@ -419,7 +419,7 @@ namespace Mono.CSharp {
                /// <summary>
                /// Analyze whether CLS-Compliant verification must be execute for this MemberCore.
                /// </summary>
-               public override bool IsClsCompliaceRequired (DeclSpace container)
+               public override bool IsClsComplianceRequired (DeclSpace container)
                {
                        if ((caching_flags & Flags.ClsCompliance_Undetected) == 0)
                                return (caching_flags & Flags.ClsCompliant) != 0;
@@ -492,12 +492,12 @@ namespace Mono.CSharp {
                /// </summary>
                protected virtual bool VerifyClsCompliance (DeclSpace ds)
                {
-                       if (!IsClsCompliaceRequired (ds)) {
+                       if (!IsClsComplianceRequired (ds)) {
                                if (HasClsCompliantAttribute && RootContext.WarningLevel >= 2) {
                                        if (!IsExposedFromAssembly (ds))
-                                               Report.Warning (3019, Location, "CLS compliance checking will not be performed on `{0}' because it is not visible from outside this assembly", GetSignatureForError ());
+                                               Report.Warning (3019, 2, Location, "CLS compliance checking will not be performed on `{0}' because it is not visible from outside this assembly", GetSignatureForError ());
                                        if (!CodeGen.Assembly.IsClsCompliant)
-                                               Report.Warning (3021, Location, "`{0}' does not need a CLSCompliant attribute because the assembly is not marked as CLS-compliant", GetSignatureForError ());
+                                               Report.Warning (3021, 2, Location, "`{0}' does not need a CLSCompliant attribute because the assembly is not marked as CLS-compliant", GetSignatureForError ());
                                }
                                return false;
                        }
@@ -739,8 +739,6 @@ namespace Mono.CSharp {
                public TypeExpr ResolveBaseTypeExpr (Expression e, bool silent, Location loc)
                {
                        TypeResolveEmitContext.loc = loc;
-                       TypeResolveEmitContext.ContainerType = TypeBuilder;
-
                        return e.ResolveAsTypeTerminal (TypeResolveEmitContext, silent);
                }
                
@@ -1820,7 +1818,7 @@ namespace Mono.CSharp {
                                        }
                                } else {
                                        mi = (MethodInfo) entry.Member;
-                                       cmpAttrs = TypeManager.GetArgumentTypes (mi);
+                                       cmpAttrs = TypeManager.GetParameterData (mi).Types;
                                }
 
                                if (fi != null) {
@@ -2032,7 +2030,7 @@ namespace Mono.CSharp {
                
                                MethodBase method_to_compare = (MethodBase)entry.Member;
                                AttributeTester.Result result = AttributeTester.AreOverloadedMethodParamsClsCompliant (
-                                       method.ParameterTypes, TypeManager.GetArgumentTypes (method_to_compare));
+                                       method.ParameterTypes, TypeManager.GetParameterData (method_to_compare).Types);
 
                                if (result == AttributeTester.Result.Ok)
                                        continue;
@@ -2041,7 +2039,7 @@ namespace Mono.CSharp {
 
                                // TODO: now we are ignoring CLSCompliance(false) on method from other assembly which is buggy.
                                // However it is exactly what csc does.
-                               if (md != null && !md.IsClsCompliaceRequired (method.Parent))
+                               if (md != null && !md.IsClsComplianceRequired (method.Parent))
                                        continue;
                
                                Report.SymbolRelatedToPreviousError (entry.Member);