C++: Respond to more review comments. (1) Use getClassAndName to ensure a good join order, and (2) unify the two abstract predicates on PointerWrapper.

Author: MathiasVP

cpp/ql/src/semmle/code/cpp/models/implementations/SmartPointer.qll

@@ -7,13 +7,10 @@ import semmle.code.cpp.models.interfaces.PointerWrapper
 private class UniqueOrSharedPtr extends Class, PointerWrapper {
   UniqueOrSharedPtr() { this.hasQualifiedName(["std", "bsl"], ["shared_ptr", "unique_ptr"]) }
 
-  override MemberFunction getADereferenceFunction() {
-    result.(OverloadedPointerDereferenceFunction).getDeclaringType() = this
-  }
-
   override MemberFunction getAnUnwrapperFunction() {
-    result.getDeclaringType() = this and
-    result.hasName(["operator->", "get"])
+    result.(OverloadedPointerDereferenceFunction).getDeclaringType() = this
+    or
+    result.getClassAndName(["operator->", "get"]) = this
   }
 }
 

cpp/ql/src/semmle/code/cpp/models/interfaces/PointerWrapper.qll

@@ -4,9 +4,11 @@ private import cpp
 
 /** A class that wraps a pointer type. For example, `std::unique_ptr` and `std::shared_ptr`. */
 abstract class PointerWrapper extends Class {
-  /** Gets a member fucntion of this class that dereferences wrapped pointer, if any. */
-  abstract MemberFunction getADereferenceFunction();
-
-  /** Gets a member fucntion of this class that returns the wrapped pointer, if any. */
+  /**
+   * Gets a member function of this class that returns the wrapped pointer, if any.
+   *
+   * This includes both functions that return the wrapped pointer by value, and functions
+   * that return a reference to the pointed-to object.
+   */
   abstract MemberFunction getAnUnwrapperFunction();
 }