2002-11-08 Miguel de Icaza <miguel@ximian.com>

	* expression.cs: tiny optimization, avoid calling IsConstant,
	because it effectively performs the lookup twice.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index b765ed610a8fb7e156198d6fb7704457a33dc36c..0a949e44181147c5dd2e679418826d98a8926fb2 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-08  Miguel de Icaza  <miguel@ximian.com>
+
+       * expression.cs: tiny optimization, avoid calling IsConstant,
+       because it effectively performs the lookup twice.
+
 2002-11-06  Miguel de Icaza  <miguel@ximian.com>
 
        But a bogus return here to keep the semantics of the old code

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 7004640a1b64e5b82daf3c31eac9acd9d0f7752d..46d12259ab97ceb165ffe3cec0a9bb09ecf5a06e 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -2859,10 +2859,10 @@ namespace Mono.CSharp {
                public override Expression DoResolve (EmitContext ec)
                {
                        VariableInfo vi = VariableInfo;
-
-                       if (Block.IsConstant (Name)) {
-                               Expression e = Block.GetConstantExpression (Name);
-
+                       Expression e;
+                       
+                       e = Block.GetConstantExpression (Name);
+                       if (e != null) {
                                vi.Used = true;
                                return e;
                        }