Merge pull request #6994 from erik-krogh/redundant-cast

Approved by RasmusWL, aschackmull, esbena, geoffw0, hvitved, nickrolfe

python/ql/lib/semmle/python/SpecialMethods.qll

@@ -107,7 +107,7 @@ class SpecialMethodCallNode extends PotentialSpecialMethodCallNode {
 
   SpecialMethodCallNode() {
     exists(SpecialMethod::Potential pot |
-      this.(SpecialMethod::Potential) = pot and
+      this = pot and
       pot.getSelf().pointsTo().getClass().lookup(pot.getSpecialMethodName()) = resolvedSpecialMethod
     )
   }

python/ql/lib/semmle/python/Stmts.qll

@@ -94,13 +94,13 @@ class AugAssign extends AugAssign_ {
    * Gets the target of this augmented assignment statement.
    * That is, the `a` in `a += b`.
    */
-  Expr getTarget() { result = this.getOperation().(BinaryExpr).getLeft() }
+  Expr getTarget() { result = this.getOperation().getLeft() }
 
   /**
    * Gets the value of this augmented assignment statement.
    * That is, the `b` in `a += b`.
    */
-  Expr getValue() { result = this.getOperation().(BinaryExpr).getRight() }
+  Expr getValue() { result = this.getOperation().getRight() }
 
   override Stmt getASubStatement() { none() }
 }

python/ql/lib/semmle/python/essa/Definitions.qll

@@ -221,7 +221,7 @@ class ModuleVariable extends SsaSourceVariable {
   pragma[noinline]
   ImportMemberNode global_variable_import() {
     result.getScope() = this.(GlobalVariable).getScope() and
-    import_from_dot_in_init(result.(ImportMemberNode).getModule(this.getName()))
+    import_from_dot_in_init(result.getModule(this.getName()))
   }
 
   override ControlFlowNode getAnImplicitUse() {
@@ -306,7 +306,7 @@ class EscapingGlobalVariable extends ModuleVariable {
   Scope scope_as_global_variable() { result = this.(GlobalVariable).getScope() }
 
   override CallNode redefinedAtCallSite() {
-    result.(CallNode).getScope().getScope*() = this.scope_as_global_variable()
+    result.getScope().getScope*() = this.scope_as_global_variable()
   }
 }
 
@@ -332,7 +332,7 @@ class SpecialSsaSourceVariable extends SsaSourceVariable {
   Scope scope_as_global_variable() { result = this.(GlobalVariable).getScope() }
 
   override CallNode redefinedAtCallSite() {
-    result.(CallNode).getScope().getScope*() = this.scope_as_global_variable()
+    result.getScope().getScope*() = this.scope_as_global_variable()
   }
 }
 

python/ql/lib/semmle/python/frameworks/Aiohttp.qll

@@ -330,8 +330,8 @@ module AiohttpWebModel {
         exists(Await await, DataFlow::CallCfgNode call, DataFlow::AttrRead read |
           this.asExpr() = await
         |
-          read.(DataFlow::AttrRead).getObject() = Request::instance() and
-          read.(DataFlow::AttrRead).getAttributeName() = "post" and
+          read.getObject() = Request::instance() and
+          read.getAttributeName() = "post" and
           call.getFunction() = read and
           await.getValue() = call.asExpr()
         )

python/ql/lib/semmle/python/objects/Constants.qll

@@ -248,7 +248,7 @@ class UnicodeObjectInternal extends ConstantObjectInternal, TUnicode {
   override ObjectInternal getClass() { result = TBuiltinClassObject(Builtin::special("unicode")) }
 
   override Builtin getBuiltin() {
-    result.(Builtin).strValue() = this.strValue() and
+    result.strValue() = this.strValue() and
     result.getClass() = Builtin::special("unicode")
   }
 
@@ -281,7 +281,7 @@ class BytesObjectInternal extends ConstantObjectInternal, TBytes {
   override ObjectInternal getClass() { result = TBuiltinClassObject(Builtin::special("bytes")) }
 
   override Builtin getBuiltin() {
-    result.(Builtin).strValue() = this.strValue() and
+    result.strValue() = this.strValue() and
     result.getClass() = Builtin::special("bytes")
   }
 

python/ql/lib/semmle/python/types/Properties.qll

@@ -84,7 +84,7 @@ private predicate property_getter(CallNode decorated, FunctionObject getter) {
 private predicate property_setter(CallNode decorated, FunctionObject setter) {
   property_getter(decorated, _) and
   exists(CallNode setter_call, AttrNode prop_setter |
-    prop_setter.getObject("setter").refersTo(decorated.(Object))
+    prop_setter.getObject("setter").refersTo(decorated)
   |
     setter_call.getArg(0).refersTo(setter) and
     setter_call.getFunction() = prop_setter
@@ -97,7 +97,7 @@ private predicate property_setter(CallNode decorated, FunctionObject setter) {
 private predicate property_deleter(CallNode decorated, FunctionObject deleter) {
   property_getter(decorated, _) and
   exists(CallNode deleter_call, AttrNode prop_deleter |
-    prop_deleter.getObject("deleter").refersTo(decorated.(Object))
+    prop_deleter.getObject("deleter").refersTo(decorated)
   |
     deleter_call.getArg(0).refersTo(deleter) and
     deleter_call.getFunction() = prop_deleter

python/ql/lib/semmle/python/values/StringAttributes.qll

@@ -78,5 +78,5 @@ private predicate tracking_step(ControlFlowNode src, ControlFlowNode dest) {
   or
   tracked_call_step(src, dest)
   or
-  dest.refersTo(src.(Object))
+  dest.refersTo(src)
 }

python/ql/src/Expressions/CallArgs.qll

@@ -99,14 +99,14 @@ private ControlFlowNode get_a_call(Value callable) {
 
 /** Gets the function object corresponding to the given class or function. */
 FunctionObject get_function_or_initializer_objectapi(Object func_or_cls) {
-  result = func_or_cls.(FunctionObject)
+  result = func_or_cls
   or
   result = func_or_cls.(ClassObject).declaredAttribute("__init__")
 }
 
 /** Gets the function object corresponding to the given class or function. */
 FunctionValue get_function_or_initializer(Value func_or_cls) {
-  result = func_or_cls.(FunctionValue)
+  result = func_or_cls
   or
   result = func_or_cls.(ClassValue).declaredAttribute("__init__")
 }

python/ql/src/Lexical/CommentedOutCode.qll

@@ -210,9 +210,9 @@ class CommentedOutCodeBlock extends @py_comment {
 
   /** Whether this commented-out code block is likely to be example code embedded in a larger comment. */
   predicate maybeExampleCode() {
-    exists(CommentBlock block | block.contains(this.(Comment)) |
+    exists(CommentBlock block | block.contains(this) |
       exists(int all_code |
-        all_code = sum(CommentedOutCodeBlock code | block.contains(code.(Comment)) | code.length()) and
+        all_code = sum(CommentedOutCodeBlock code | block.contains(code) | code.length()) and
         /* This ratio may need fine tuning */
         block.length() > all_code * 2
       )