Merge pull request dotnet/corefx#16150 from JonHanna/pointer_types_ty…

…pe_equal_is Test and optimise TypeEqual and TypeIs behaviour for pointer types. Commit migrated from dotnet/corefx@11c6841
picenka21 · Feb 19, 2017 · 492d736 · 492d736
2 parents 95b5156 + 6b1f56a
commit 492d736
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Common/ConstantCheck.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/Common/ConstantCheck.cs
@@ -61,7 +61,7 @@ private static AnalyzeTypeIsResult AnalyzeTypeIs(Expression operand, Type testTy
                 return testType == typeof(void) ? AnalyzeTypeIsResult.KnownTrue : AnalyzeTypeIsResult.KnownFalse;
             }
 
-            if (testType == typeof(void))
+            if (testType == typeof(void) || testType.IsPointer)
             {
                 return AnalyzeTypeIsResult.KnownFalse;
             }

diff --git a/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/TypeBinaryExpression.cs b/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/TypeBinaryExpression.cs
@@ -52,7 +52,7 @@ internal Expression ReduceTypeEqual()
         {
             Type cType = Expression.Type;
 
-            if (cType.GetTypeInfo().IsValueType)
+            if (cType.GetTypeInfo().IsValueType || TypeOperand.IsPointer)
             {
                 if (cType.IsNullableType())
                 {

diff --git a/src/libraries/System.Linq.Expressions/tests/TypeBinary/TypeEqual.cs b/src/libraries/System.Linq.Expressions/tests/TypeBinary/TypeEqual.cs
@@ -29,6 +29,17 @@ public void TypeByRef()
             Assert.Throws<ArgumentException>("type", () => Expression.TypeEqual(exp, byRef));
         }
 
+        [Theory, ClassData(typeof(CompilationTypes))]
+        public void TypePointer(bool useInterpreter)
+        {
+            Expression exp = Expression.Constant(0);
+            Type pointer = typeof(int*);
+            var test = Expression.TypeEqual(exp, pointer);
+            var lambda = Expression.Lambda<Func<bool>>(test);
+            var func = lambda.Compile(useInterpreter);
+            Assert.False(func());
+        }
+
         [Fact]
         public void UnreadableExpression()
         {

diff --git a/src/libraries/System.Linq.Expressions/tests/TypeBinary/TypeIs.cs b/src/libraries/System.Linq.Expressions/tests/TypeBinary/TypeIs.cs
@@ -29,6 +29,17 @@ public void TypeByRef()
             Assert.Throws<ArgumentException>("type", () => Expression.TypeIs(exp, byRef));
         }
 
+        [Theory, ClassData(typeof(CompilationTypes))]
+        public void TypePointer(bool useInterpreter)
+        {
+            Expression exp = Expression.Constant(0);
+            Type pointer = typeof(int*);
+            var test = Expression.TypeIs(exp, pointer);
+            var lambda = Expression.Lambda<Func<bool>>(test);
+            var func = lambda.Compile(useInterpreter);
+            Assert.False(func());
+        }
+
         [Fact]
         public void UnreadableExpression()
         {