C#: Remove redundant conditions

tamasvajk · tamasvajk · commit 7721c7bba7af · 2020-10-13T14:45:37.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
@@ -81,8 +81,6 @@ private static ExprKind GetAssignmentOperation(Context cx, AssignmentExpressionS
 
         private static ExprKind GetKind(Context cx, AssignmentExpressionSyntax syntax)
         {
-            var leftSymbol = cx.GetSymbolInfo(syntax.Left);
-            var assignEvent = leftSymbol.Symbol != null && leftSymbol.Symbol is IEventSymbol;
             var kind = GetAssignmentOperation(cx, syntax);
             var leftType = cx.GetType(syntax.Left);
 
@@ -93,6 +91,9 @@ private static ExprKind GetKind(Context cx, AssignmentExpressionSyntax syntax)
                 return kind;
             }
 
+            var leftSymbol = cx.GetSymbolInfo(syntax.Left);
+            var assignEvent = leftSymbol.Symbol is IEventSymbol;
+
             if (kind == ExprKind.ASSIGN_ADD && assignEvent)
             {
                 return ExprKind.ADD_EVENT;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -276,9 +276,9 @@ public void ExtractRecursive(TextWriter trapFile, IEntity parent)
         public static Type Create(Context cx, ITypeSymbol type)
         {
             type = type.DisambiguateType();
-            const bool errorTypeIsNull = false;
-            return type == null || (errorTypeIsNull && type.TypeKind == TypeKind.Error) ?
-                NullType.Create(cx).Type : (Type)cx.CreateEntity(type);
+            return type == null
+                ? NullType.Create(cx).Type
+                : (Type)cx.CreateEntity(type);
         }
 
         public static AnnotatedType Create(Context cx, AnnotatedTypeSymbol type) =>

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ private static ExprKind GetAssignmentOperation(Context cx, AssignmentExpressionS`
`81`	`81`
`82`	`82`	`private static ExprKind GetKind(Context cx, AssignmentExpressionSyntax syntax)`
`83`	`83`	`{`
`84`		`- var leftSymbol = cx.GetSymbolInfo(syntax.Left);`
`85`		`- var assignEvent = leftSymbol.Symbol != null && leftSymbol.Symbol is IEventSymbol;`
`86`	`84`	`var kind = GetAssignmentOperation(cx, syntax);`
`87`	`85`	`var leftType = cx.GetType(syntax.Left);`
`88`	`86`
`@@ -93,6 +91,9 @@ private static ExprKind GetKind(Context cx, AssignmentExpressionSyntax syntax)`
`93`	`91`	`return kind;`
`94`	`92`	`}`
`95`	`93`
	`94`	`+ var leftSymbol = cx.GetSymbolInfo(syntax.Left);`
	`95`	`+ var assignEvent = leftSymbol.Symbol is IEventSymbol;`
	`96`	`+`
`96`	`97`	`if (kind == ExprKind.ASSIGN_ADD && assignEvent)`
`97`	`98`	`{`
`98`	`99`	`return ExprKind.ADD_EVENT;`
Original file line number	Diff line number	Diff line change
`@@ -276,9 +276,9 @@ public void ExtractRecursive(TextWriter trapFile, IEntity parent)`
`276`	`276`	`public static Type Create(Context cx, ITypeSymbol type)`
`277`	`277`	`{`
`278`	`278`	`type = type.DisambiguateType();`
`279`		`- const bool errorTypeIsNull = false;`
`280`		`- return type == null \|\| (errorTypeIsNull && type.TypeKind == TypeKind.Error) ?`
`281`		`- NullType.Create(cx).Type : (Type)cx.CreateEntity(type);`
	`279`	`+ return type == null`
	`280`	`+ ? NullType.Create(cx).Type`
	`281`	`+ : (Type)cx.CreateEntity(type);`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`public static AnnotatedType Create(Context cx, AnnotatedTypeSymbol type) =>`