diff options
| author | Ben Maurer <benm@mono-cvs.ximian.com> | 2004-10-04 05:46:17 +0400 |
|---|---|---|
| committer | Ben Maurer <benm@mono-cvs.ximian.com> | 2004-10-04 05:46:17 +0400 |
| commit | 88c778b4f043a19e76eb91a2888340dd57124a6c (patch) | |
| tree | 7792ad2f6e90de86b6c8cd45f989ec98f1090812 | |
| parent | 684d3741e03e3ddf6f15a5d91ba4414bacaa8106 (diff) | |
2004-10-03 Ben Maurer <bmaurer@ximian.com>
* expression.cs: reftype [!=]= null should always use br[true,false].
# 67410
svn path=/branches/mono-1-0/mcs/; revision=34649
| -rwxr-xr-x | mcs/mcs/ChangeLog | 5 | ||||
| -rwxr-xr-x | mcs/mcs/expression.cs | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog index ad2a29ade0c..ede1e6ecd50 100755 --- a/mcs/mcs/ChangeLog +++ b/mcs/mcs/ChangeLog @@ -1,3 +1,8 @@ +2004-10-03 Ben Maurer <bmaurer@ximian.com> + + * expression.cs: reftype [!=]= null should always use br[true,false]. + # 67410 + 2004-09-19 Miguel de Icaza <miguel@ximian.com> * cs-parser.jay: Do not report the stack trace, it is useless diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs index 88919609049..314578e9e9e 100755 --- a/mcs/mcs/expression.cs +++ b/mcs/mcs/expression.cs @@ -2313,8 +2313,8 @@ namespace Mono.CSharp { // Special cases: string comapred to null // if (oper == Operator.Equality || oper == Operator.Inequality){ - if ((l == TypeManager.string_type && (right is NullLiteral)) || - (r == TypeManager.string_type && (left is NullLiteral))){ + if ((!TypeManager.IsValueType (l) && (right is NullLiteral)) || + (!TypeManager.IsValueType (r) && (left is NullLiteral))) { Type = TypeManager.bool_type; return this; |