2006-04-01 Marek Safar <marek.safar@seznam.cz>

* assign.cs (Assign.DoResolve): Assignment to same variable can occur in an embedded statement too. svn path=/trunk/mcs/; revision=58893
baulig · Apr 1, 2006 · 74b5247 · 74b5247
1 parent 7e33712
commit 74b5247
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
@@ -68,7 +68,7 @@ endif
 run-mcs-tests: $(TEST_SUPPORT_FILES)
 
 run-mcs-tests:
-	MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe negative $(TEST_PATTERN) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
+	MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe negative 0 $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
 
 clean-local:
 	rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk

diff --git a/mcs/errors/cs1717-5.cs b/mcs/errors/cs1717-5.cs
@@ -0,0 +1,11 @@
+// cs1717-5.cs: Assignment made to same variable; did you mean to assign something else?
+// Line: 9
+// Compiler options: -warnaserror -warn:3
+
+class A
+{
+	public A ()
+	{
+		int a = a = 5;
+	}
+}
diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-01  Marek Safar  <marek.safar@seznam.cz>
+
+	* assign.cs (Assign.DoResolve): Assignment to same variable can occur
+	in an embedded statement too.
+
 2006-04-01  Raja R Harinath  <rharinath@novell.com>
 
 	Fix #77929

diff --git a/mcs/gmcs/assign.cs b/mcs/gmcs/assign.cs
@@ -362,7 +362,8 @@ public override Expression DoResolve (EmitContext ec)
 			if (target == null)
 				return null;
 
-			if (source.Equals (target)) {
+			bool same_assignment = (embedded != null) ? embedded.Target.Equals(target) : source.Equals (target);
+			if (same_assignment) {
 				Report.Warning (1717, 3, loc, "Assignment made to same variable; did you mean to assign something else?");
 			}
 

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-01  Marek Safar  <marek.safar@seznam.cz>
+
+	* assign.cs (Assign.DoResolve): Assignment to same variable can occur
+	in an embedded statement too.
+
 2006-04-01  Raja R Harinath  <rharinath@novell.com>
 
 	Fix #77958

diff --git a/mcs/mcs/assign.cs b/mcs/mcs/assign.cs
@@ -362,7 +362,8 @@ public override Expression DoResolve (EmitContext ec)
 			if (target == null)
 				return null;
 
-			if (source.Equals (target)) {
+			bool same_assignment = (embedded != null) ? embedded.Target.Equals(target) : source.Equals (target);
+			if (same_assignment) {
 				Report.Warning (1717, 3, loc, "Assignment made to same variable; did you mean to assign something else?");
 			}