2004-10-18 Martin Baulig <martin@ximian.com>

	* expression.cs (Cast.DoResolve): Don't access the TypeExpr's
	`Type' directly, but call ResolveType() on it.
	(Probe.DoResolve): Likewise.

svn path=/trunk/mcs/; revision=35108

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 5e41f75a65f2cd4504861c8aa71e84e756f068e2..6cdb8e3ee1c9ea11ad59b0e9acf91af95cbbf741 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-18  Martin Baulig  <martin@ximian.com>
+
+       * expression.cs (Cast.DoResolve): Don't access the TypeExpr's
+       `Type' directly, but call ResolveType() on it.
+       (Probe.DoResolve): Likewise.
+
 2004-10-18  Raja R Harinath  <rharinath@novell.com>
 
        * class.cs (FieldMember.DoDefine): Reset ec.InUnsafe after doing

diff --git a/mcs/gmcs/expression.cs b/mcs/gmcs/expression.cs
index 2311a46a4930c7f8c515820470f1f360f798b656..cadc32ec729ec8926fc44d2f1b3309b9c1b9e4e5 100755 (executable)
--- a/mcs/gmcs/expression.cs
+++ b/mcs/gmcs/expression.cs
@@ -1031,10 +1031,10 @@ namespace Mono.CSharp {
 
                public override Expression DoResolve (EmitContext ec)
                {
-                       ProbeType = ProbeType.ResolveAsTypeTerminal (ec, false);
-                       if (ProbeType == null)
+                       TypeExpr texpr = ProbeType.ResolveAsTypeTerminal (ec, false);
+                       if (texpr == null)
                                return null;
-                       probe_type = ProbeType.Type;
+                       probe_type = texpr.ResolveType (ec);
 
                        CheckObsoleteAttribute (probe_type);
 
@@ -1772,7 +1772,7 @@ namespace Mono.CSharp {
                        if (target == null)
                                return null;
 
-                       type = target.Type;
+                       type = target.ResolveType (ec);
 
                        CheckObsoleteAttribute (type);
 

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 4efd051ce389b2026294822d77846b798f153251..21119cd15445915b8739442368f31ac1bc60309f 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -4,6 +4,12 @@
        here, it makes it easier for me to see what changed in MCS since
        the last time I merged.
 
+2004-10-18  Martin Baulig  <martin@ximian.com>
+
+       * expression.cs (Cast.DoResolve): Don't access the TypeExpr's
+       `Type' directly, but call ResolveType() on it.
+       (Probe.DoResolve): Likewise.
+
 2004-10-18  Martin Baulig  <martin@ximian.com>
 
        * expression.cs (Invocation.BetterFunction): Put back

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index cfdfd9e84b117102961abd65081b7fd05fa0c932..741e25f81abc5b14f7a9be9bc48ba8910d207f1b 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -1031,10 +1031,10 @@ namespace Mono.CSharp {
 
                public override Expression DoResolve (EmitContext ec)
                {
-                       ProbeType = ProbeType.ResolveAsTypeTerminal (ec, false);
-                       if (ProbeType == null)
+                       TypeExpr texpr = ProbeType.ResolveAsTypeTerminal (ec, false);
+                       if (texpr == null)
                                return null;
-                       probe_type = ProbeType.Type;
+                       probe_type = texpr.ResolveType (ec);
 
                        CheckObsoleteAttribute (probe_type);
 
@@ -1772,7 +1772,7 @@ namespace Mono.CSharp {
                        if (target == null)
                                return null;
 
-                       type = target.Type;
+                       type = target.ResolveType (ec);
 
                        CheckObsoleteAttribute (type);