JS: Fix getRawEnclosingStmt call

Author: asgerf

javascript/ql/lib/semmle/javascript/Expr.qll

@@ -240,21 +240,15 @@ class Expr extends @expr, ExprOrStmt, ExprOrType, AST::ValueNode {
     )
   }
 
-  pragma[inline]
-  private Stmt getRawEnclosingStmt(Expr e) {
-    // For performance reasons, we need the enclosing statement without overrides
-    enclosing_stmt(e, result)
-  }
-
   /**
    * Gets the data-flow node where exceptions thrown by this expression will
    * propagate if this expression causes an exception to be thrown.
    */
   pragma[inline]
   DataFlow::Node getExceptionTarget() {
-    result = getCatchParameterFromStmt(this.getRawEnclosingStmt(this))
+    result = getCatchParameterFromStmt(getRawEnclosingStmt(this))
     or
-    not exists(getCatchParameterFromStmt(this.getRawEnclosingStmt(this))) and
+    not exists(getCatchParameterFromStmt(getRawEnclosingStmt(this))) and
     result =
       any(DataFlow::FunctionNode f | f.getFunction() = this.getContainer()).getExceptionalReturn()
   }
@@ -267,6 +261,13 @@ private DataFlow::Node getCatchParameterFromStmt(Stmt stmt) {
     DataFlow::parameterNode(stmt.getEnclosingTryCatchStmt().getACatchClause().getAParameter())
 }
 
+overlay[caller]
+pragma[inline]
+private Stmt getRawEnclosingStmt(Expr e) {
+  // For performance reasons, we need the enclosing statement without overrides
+  enclosing_stmt(e, result)
+}
+
 /**
  * An identifier.
  *