[mcs] Replace 1684 warning turned into error with unique 7069 error code

diff --git a/mcs/errors/CS1684-lib.il b/mcs/errors/CS1684-lib.il
deleted file mode 100644 (file)
index 535091d..0000000
--- a/mcs/errors/CS1684-lib.il
+++ /dev/null
@@ -1,24 +0,0 @@
-.assembly extern mscorlib
-{
-}
-
-.assembly 'CS1684-lib'
-{
-  .hash algorithm 0x00008004
-  .ver 0:0:0:0
-}
-
-.module 'CS1684-lib.dll'
-
-.class public auto ansi beforefieldinit A
-       extends [mscorlib]TYWSF$
-{
-  .method public hidebysig specialname rtspecialname 
-          instance void  .ctor() cil managed
-  {
-    IL_0000:  ldarg.0
-    IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
-    IL_0006:  ret
-  }
-
-}

diff --git a/mcs/errors/CS7069-lib.il b/mcs/errors/CS7069-lib.il
new file mode 100644 (file)
index 0000000..a7472ea
--- /dev/null
+++ b/mcs/errors/CS7069-lib.il
@@ -0,0 +1,24 @@
+.assembly extern mscorlib
+{
+}
+
+.assembly 'CS7069-lib'
+{
+  .hash algorithm 0x00008004
+  .ver 0:0:0:0
+}
+
+.module 'CS7069-lib.dll'
+
+.class public auto ansi beforefieldinit A
+       extends [mscorlib]TYWSF$
+{
+  .method public hidebysig specialname rtspecialname 
+          instance void  .ctor() cil managed
+  {
+    IL_0000:  ldarg.0
+    IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
+    IL_0006:  ret
+  }
+
+}

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index e809a14da445035d3509d1785fc9cedb36f0eb72..d19d3c469309d65daf71f9e4ab7bd9b3aa60f021 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -32,9 +32,10 @@ TEST_SUPPORT_FILES = \
        CS0730-lib.dll CS0731-1-lib.dll CS0731-2-lib.dll \
        CS1070-lib.dll \
        CS1540-15-lib.dll CS1540-17-lib.dll CS1542-lib.dll CS1577-lib.dll \
-       CS1683-lib.dll CS1684-lib.dll CS1685-2-lib.dll \
+       CS1683-lib.dll CS1685-2-lib.dll \
        dlls/first/CS1701-lib.dll dlls/second/CS1701-lib.dll CS1701-lib.dll dlls/first/CS1702-lib.dll dlls/second/CS1702-lib.dll CS1702-lib.dll dlls/first/CS1705-lib.dll dlls/second/CS1705-lib.dll CS1705-lib.dll \
        CS2015-lib.dll CS3005-16-lib.dll CS3013-module.dll CSExternAlias-lib.dll \
+       CS7069-lib.dll \
        CS8009-lib.dll \
        CSFriendAssembly-lib.dll \
        dlls/first/CS1703-lib.dll dlls/first/CS1704-lib.dll \

diff --git a/mcs/errors/cs1684.cs b/mcs/errors/cs1684.cs
deleted file mode 100644 (file)
index a2d874a..0000000
--- a/mcs/errors/cs1684.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-// CS1684: Reference to type `TYWSF$' claims it is defined assembly `mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089', but it could not be found
-// Line: 5
-// Compiler options: -r:CS1684-lib.dll
-
-public class TestClass : A
-{
-}

diff --git a/mcs/errors/cs7069.cs b/mcs/errors/cs7069.cs
new file mode 100644 (file)
index 0000000..2c231f7
--- /dev/null
+++ b/mcs/errors/cs7069.cs
@@ -0,0 +1,7 @@
+// CS1684: Reference to type `TYWSF$' claims it is defined assembly `mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089', but it could not be found
+// Line: 5
+// Compiler options: -r:CS7069-lib.dll
+
+public class TestClass : A
+{
+}

diff --git a/mcs/mcs/import.cs b/mcs/mcs/import.cs
index 6dea50a33ae6a93b3e863123ff7ee3deacfb5cd0..cc9b68cd5a2ad1ebafcf58da66533e2d0542ab06 100644 (file)
--- a/mcs/mcs/import.cs
+++ b/mcs/mcs/import.cs
@@ -1960,7 +1960,7 @@ namespace Mono.CSharp
                {
                        // 
                        // Report details about missing type and most likely cause of the problem.
-                       // csc reports 1683, 1684 as warnings but we report them only when used
+                       // csc used to reports 1683, 1684 (now 7069) as warnings but we report them only when used
                        // or referenced from the user core in which case compilation error has to
                        // be reported because compiler cannot continue anyway
                        //
@@ -2001,7 +2001,7 @@ namespace Mono.CSharp
                                        report.Error (731, loc, "The type forwarder for type `{0}' in assembly `{1}' has circular dependency",
                                                name, definition.DeclaringAssembly.FullName);
                                } else {
-                                       report.Error (1684, loc,
+                                       report.Error (7069, loc,
                                                "Reference to type `{0}' claims it is defined assembly `{1}', but it could not be found",
                                                name, t.MemberDefinition.DeclaringAssembly.FullName);
                                }