C++: Move getIndirectionIndex to ReturnKind.

geoffw0 · geoffw0 · commit 4c1f433073d0 · 2024-01-23T14:52:44.000Z
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -454,6 +454,11 @@ private newtype TReturnKind =
  * from a callable. For C++, this is simply a function return.
  */
 class ReturnKind extends TReturnKind {
+  /**
+   * Gets the indirection index of this return kind.
+   */
+  abstract int getIndirectionIndex();
+
   /** Gets a textual representation of this return kind. */
   abstract string toString();
 }
@@ -466,7 +471,7 @@ class NormalReturnKind extends ReturnKind, TNormalReturnKind {
 
   NormalReturnKind() { this = TNormalReturnKind(indirectionIndex) }
 
-  int getIndirectionIndex() { result = indirectionIndex }
+  override int getIndirectionIndex() { result = indirectionIndex }
 
   override string toString() { result = "indirect return" }
 }
@@ -480,6 +485,8 @@ private class IndirectReturnKind extends ReturnKind, TIndirectReturnKind {
 
   IndirectReturnKind() { this = TIndirectReturnKind(argumentIndex, indirectionIndex) }
 
+  override int getIndirectionIndex() { result = indirectionIndex }
+
   override string toString() { result = "indirect outparam[" + argumentIndex.toString() + "]" }
 }
 
