Merged in implementation of CSHARP-458 with one additional check to make sure cast doesn't fail.

rstam · rstam · commit 1f2b8557e55b · 2012-05-21T15:54:08.000-04:00
diff --git a/Driver/Linq/Expressions/ExpressionNormalizer.cs b/Driver/Linq/Expressions/ExpressionNormalizer.cs
@@ -82,15 +82,16 @@ protected override Expression VisitBinary(BinaryExpression node)
                 }
             }
 
-            //VB creates coalescing operations when dealing with nullable value comparisons, so we try and make this look like C#\
+            // VB creates coalescing operations when dealing with nullable value comparisons, so we try and make this look like C#
             if (node.NodeType == ExpressionType.Coalesce)
             {
                 var right = node.Right as ConstantExpression;
-                if (node.Left.NodeType == ExpressionType.Equal
-                    && node.Left.Type.IsGenericType 
-                    && node.Left.Type.GetGenericTypeDefinition() == typeof(Nullable<>) 
-                    && right != null 
-                    && (bool)right.Value == false)
+                if (node.Left.NodeType == ExpressionType.Equal &&
+                    node.Left.Type.IsGenericType &&
+                    node.Left.Type.GetGenericTypeDefinition() == typeof(Nullable<>) &&
+                    right != null &&
+                    right.Type == typeof(bool) &&
+                    (bool)right.Value == false)
                 {
                     node = (BinaryExpression)node.Left;
                     return Expression.MakeBinary(

Original file line number	Diff line number	Diff line change
`@@ -82,15 +82,16 @@ protected override Expression VisitBinary(BinaryExpression node)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- //VB creates coalescing operations when dealing with nullable value comparisons, so we try and make this look like C#\`
	`85`	`+ // VB creates coalescing operations when dealing with nullable value comparisons, so we try and make this look like C#`
`86`	`86`	`if (node.NodeType == ExpressionType.Coalesce)`
`87`	`87`	`{`
`88`	`88`	`var right = node.Right as ConstantExpression;`
`89`		`- if (node.Left.NodeType == ExpressionType.Equal`
`90`		`- && node.Left.Type.IsGenericType`
`91`		`- && node.Left.Type.GetGenericTypeDefinition() == typeof(Nullable<>)`
`92`		`- && right != null`
`93`		`- && (bool)right.Value == false)`
	`89`	`+ if (node.Left.NodeType == ExpressionType.Equal &&`
	`90`	`+ node.Left.Type.IsGenericType &&`
	`91`	`+ node.Left.Type.GetGenericTypeDefinition() == typeof(Nullable<>) &&`
	`92`	`+ right != null &&`
	`93`	`+ right.Type == typeof(bool) &&`
	`94`	`+ (bool)right.Value == false)`
`94`	`95`	`{`
`95`	`96`	`node = (BinaryExpression)node.Left;`
`96`	`97`	`return Expression.MakeBinary(`