C#: Get rid of the isOwnInstanceAccess based on ReturnStmt.

Author: michaelnebel

csharp/ql/src/utils/model-generator/CaptureSummaryModels.qll

@@ -9,9 +9,9 @@ import CaptureSummaryModelsSpecific
  * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
  */
 string captureQualifierFlow(TargetAPI api) {
-  exists(ReturnStmt rtn |
-    rtn.getEnclosingCallable() = api and
-    isOwnInstanceAccess(rtn)
+  exists(ReturnNodeExt ret |
+    api = returnNodeEnclosingCallable(ret) and
+    isOwnInstanceAccessNode(ret)
   ) and
   result = asValueModel(api, qualifierString(), "ReturnValue")
 }

csharp/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll

@@ -8,7 +8,8 @@ import semmle.code.csharp.dataflow.internal.DataFlowImplCommon
 import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 import ModelGeneratorUtils
 
-predicate isOwnInstanceAccess(ReturnStmt rtn) { rtn.getExpr() instanceof ThisAccess }
+pragma[inline]
+Callable returnNodeEnclosingCallable(ReturnNodeExt ret) { result = getNodeEnclosingCallable(ret) }
 
 predicate isOwnInstanceAccessNode(ReturnNode node) { node.asExpr() instanceof ThisAccess }
 

java/ql/src/utils/model-generator/CaptureSummaryModels.qll

@@ -9,9 +9,9 @@ import CaptureSummaryModelsSpecific
  * Gets the summary model of `api`, if it follows the `fluent` programming pattern (returns `this`).
  */
 string captureQualifierFlow(TargetApi api) {
-  exists(ReturnStmt rtn |
-    rtn.getEnclosingCallable() = api and
-    isOwnInstanceAccess(rtn)
+  exists(ReturnNodeExt ret |
+    api = returnNodeEnclosingCallable(ret) and
+    isOwnInstanceAccessNode(ret)
   ) and
   result = asValueModel(api, qualifierString(), "ReturnValue")
 }

java/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll

@@ -10,7 +10,10 @@ import semmle.code.java.dataflow.internal.DataFlowPrivate
 import semmle.code.java.dataflow.InstanceAccess
 import ModelGeneratorUtils
 
-predicate isOwnInstanceAccess(ReturnStmt rtn) { rtn.getResult().(ThisAccess).isOwnInstanceAccess() }
+pragma[inline]
+Callable returnNodeEnclosingCallable(ReturnNodeExt ret) {
+  result = getNodeEnclosingCallable(ret).asCallable()
+}
 
 predicate isOwnInstanceAccessNode(ReturnNode node) {
   node.asExpr().(ThisAccess).isOwnInstanceAccess()