Static analysis: revert tail recursion unrolling (#26970)

dotnet · Dec 14, 2021 · 0aeab4d · 0aeab4d
1 parent 08e5ebd
commit 0aeab4d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 77 deletions.
diff --git a/src/EFCore/Design/Internal/CSharpRuntimeAnnotationCodeGenerator.cs b/src/EFCore/Design/Internal/CSharpRuntimeAnnotationCodeGenerator.cs
@@ -262,34 +262,28 @@ protected virtual void GenerateSimpleAnnotation(
     /// <param name="namespaces">The set of namespaces to add to.</param>
     protected virtual void AddNamespace(Type type, ISet<string> namespaces)
     {
-        while (true)
+        if (type.IsNested)
         {
-            if (type.IsNested)
-            {
-                AddNamespace(type.DeclaringType!, namespaces);
-            }
-
-            if (type.Namespace != null)
-            {
-                namespaces.Add(type.Namespace);
-            }
+            AddNamespace(type.DeclaringType!, namespaces);
+        }
 
-            if (type.IsGenericType)
-            {
-                foreach (var argument in type.GenericTypeArguments)
-                {
-                    AddNamespace(argument, namespaces);
-                }
-            }
+        if (type.Namespace != null)
+        {
+            namespaces.Add(type.Namespace);
+        }
 
-            var sequenceType = type.TryGetSequenceType();
-            if (sequenceType != null)
+        if (type.IsGenericType)
+        {
+            foreach (var argument in type.GenericTypeArguments)
             {
-                type = sequenceType;
-                continue;
+                AddNamespace(argument, namespaces);
             }
+        }
 
-            break;
+        var sequenceType = type.TryGetSequenceType();
+        if (sequenceType != null)
+        {
+            AddNamespace(sequenceType, namespaces);
         }
     }
 }
diff --git a/src/EFCore/Extensions/Internal/ExpressionExtensions.cs b/src/EFCore/Extensions/Internal/ExpressionExtensions.cs
@@ -182,18 +182,14 @@ public static bool IsLogicalNot(this UnaryExpression sqlUnaryExpression)
     [return: NotNullIfNotNull("expression")]
     private static Expression? RemoveConvert(Expression? expression)
     {
-        while (true)
+        if (expression is UnaryExpression unaryExpression
+            && (expression.NodeType == ExpressionType.Convert
+                || expression.NodeType == ExpressionType.ConvertChecked))
         {
-            if (expression is UnaryExpression unaryExpression
-                && (expression.NodeType == ExpressionType.Convert
-                    || expression.NodeType == ExpressionType.ConvertChecked))
-            {
-                expression = unaryExpression.Operand;
-                continue;
-            }
-
-            return expression;
+            return RemoveConvert(unaryExpression.Operand);
         }
+
+        return expression;
     }
 
     private static readonly MethodInfo ObjectEqualsMethodInfo

diff --git a/src/EFCore/Query/Internal/ParameterExtractingExpressionVisitor.cs b/src/EFCore/Query/Internal/ParameterExtractingExpressionVisitor.cs
@@ -111,38 +111,34 @@ private Expression ExtractParameters(Expression expression, bool clearEvaluatedV
     private static bool PreserveInitializationConstant(Expression expression, bool generateParameter)
         => !generateParameter && (expression is NewExpression || expression is MemberInitExpression);
 
-    private static bool PreserveConvertNode(Expression expression)
+    private bool PreserveConvertNode(Expression expression)
     {
-        while (true)
+        if (expression is UnaryExpression unaryExpression
+            && (unaryExpression.NodeType == ExpressionType.Convert
+                || unaryExpression.NodeType == ExpressionType.ConvertChecked))
         {
-            if (expression is UnaryExpression unaryExpression
-                && (unaryExpression.NodeType == ExpressionType.Convert
-                    || unaryExpression.NodeType == ExpressionType.ConvertChecked))
+            if (unaryExpression.Type == typeof(object)
+                || unaryExpression.Type == typeof(Enum)
+                || unaryExpression.Operand.Type.UnwrapNullableType().IsEnum)
             {
-                if (unaryExpression.Type == typeof(object)
-                    || unaryExpression.Type == typeof(Enum)
-                    || unaryExpression.Operand.Type.UnwrapNullableType().IsEnum)
-                {
-                    return true;
-                }
-
-                var innerType = unaryExpression.Operand.Type.UnwrapNullableType();
-                if (unaryExpression.Type.UnwrapNullableType() == typeof(int)
-                    && (innerType == typeof(byte)
-                        || innerType == typeof(sbyte)
-                        || innerType == typeof(char)
-                        || innerType == typeof(short)
-                        || innerType == typeof(ushort)))
-                {
-                    return true;
-                }
+                return true;
+            }
 
-                expression = unaryExpression.Operand;
-                continue;
+            var innerType = unaryExpression.Operand.Type.UnwrapNullableType();
+            if (unaryExpression.Type.UnwrapNullableType() == typeof(int)
+                && (innerType == typeof(byte)
+                    || innerType == typeof(sbyte)
+                    || innerType == typeof(char)
+                    || innerType == typeof(short)
+                    || innerType == typeof(ushort)))
+            {
+                return true;
             }
 
-            return false;
+            return PreserveConvertNode(unaryExpression.Operand);
         }
+
+        return false;
     }
 
     /// <summary>
@@ -368,18 +364,14 @@ public ContextParameterReplacingExpressionVisitor(Type contextType)
 
     private static Expression RemoveConvert(Expression expression)
     {
-        while (true)
+        if (expression is UnaryExpression unaryExpression
+            && (expression.NodeType == ExpressionType.Convert
+                || expression.NodeType == ExpressionType.ConvertChecked))
         {
-            if (expression is UnaryExpression unaryExpression
-                && (expression.NodeType == ExpressionType.Convert
-                    || expression.NodeType == ExpressionType.ConvertChecked))
-            {
-                expression = unaryExpression.Operand;
-                continue;
-            }
-
-            return expression;
+            return RemoveConvert(unaryExpression.Operand);
         }
+
+        return expression;
     }
 
     private object? GetValue(Expression? expression, out string? parameterName)

diff --git a/src/Shared/ExpressionExtensions.cs b/src/Shared/ExpressionExtensions.cs
@@ -43,18 +43,14 @@ public static LambdaExpression UnwrapLambdaFromQuote(this Expression expression)
 
     private static Expression RemoveConvert(Expression expression)
     {
-        while (true)
+        if (expression is UnaryExpression unaryExpression
+            && (expression.NodeType == ExpressionType.Convert
+                || expression.NodeType == ExpressionType.ConvertChecked))
         {
-            if (expression is UnaryExpression unaryExpression
-                && (expression.NodeType == ExpressionType.Convert
-                    || expression.NodeType == ExpressionType.ConvertChecked))
-            {
-                expression = unaryExpression.Operand;
-                continue;
-            }
-
-            return expression;
+            return RemoveConvert(unaryExpression.Operand);
         }
+
+        return expression;
     }
 
     public static T GetConstantValue<T>(this Expression expression)