C++: Replace getUnderlyingType().getUnspecifiedType()

Author: Robert Marsh

cpp/ql/src/Best Practices/Exceptions/CatchingByValue.ql

@@ -13,6 +13,6 @@
 import cpp
 
 from CatchBlock cb, Class caughtType
-where caughtType = cb.getParameter().getType().getUnderlyingType().getUnspecifiedType()
+where caughtType = cb.getParameter().getUnspecifiedType()
 select cb,
   "This should catch a " + caughtType.getName() + " by (const) reference rather than by value."

cpp/ql/src/Best Practices/Unused Entities/UnusedLocals.ql

@@ -40,7 +40,7 @@ class TemplateDependentType extends Type {
  * A variable whose declaration has, or may have, side effects.
  */
 predicate declarationHasSideEffects(Variable v) {
-  exists(Class c | c = v.getType().getUnderlyingType().getUnspecifiedType() |
+  exists(Class c | c = v.getUnspecifiedType() |
     c.hasConstructor() or
     c.hasDestructor()
   )

cpp/ql/src/Best Practices/Unused Entities/UnusedStaticVariables.ql

@@ -14,7 +14,7 @@
 import cpp
 
 predicate declarationHasSideEffects(Variable v) {
-  exists(Class c | c = v.getType().getUnderlyingType().getUnspecifiedType() |
+  exists(Class c | c = v.getUnspecifiedType() |
     c.hasConstructor() or c.hasDestructor()
   )
 }

cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql

@@ -21,7 +21,7 @@ import cpp
 predicate functionsMissingReturnStmt(Function f, ControlFlowNode blame) {
   f.fromSource() and
   exists(Type returnType |
-    returnType = f.getType().getUnderlyingType().getUnspecifiedType() and
+    returnType = f.getUnspecifiedType() and
     not returnType instanceof VoidType and
     not returnType instanceof TemplateParameter
   ) and

cpp/ql/src/jsf/4.17 Types/AV Rule 147.ql

@@ -24,8 +24,8 @@ class InvalidFloatCastExpr extends Expr {
 
   InvalidFloatCastExpr() {
     exists(Type src, Type dst |
-      src = this.getUnderlyingType().getUnspecifiedType() and
-      dst = this.getActualType().getUnderlyingType().getUnspecifiedType() and
+      src = this.getUnspecifiedType() and
+      dst = this.getActualType().getUnspecifiedType() and
       src.(GeneralPointerType).getBaseType() instanceof FloatingPointType and
       src.(GeneralPointerType).getBaseType() != dst.(GeneralPointerType).getBaseType()
     )

cpp/ql/src/jsf/4.17 Types/AV Rule 148.ql

@@ -17,5 +17,5 @@ from SwitchStmt s
 where forex(SwitchCase sc | sc = s.getASwitchCase() and not sc instanceof DefaultCase |
              sc.getExpr().(VariableAccess).getTarget().isConst())
       // Allow switch on character types
-      and not (s.getExpr().getUnderlyingType().getUnspecifiedType() instanceof CharType)
+      and not (s.getExpr().getUnspecifiedType() instanceof CharType)
 select s, "Enumeration types should be used instead of integers to select from a limited series of choices."

cpp/ql/src/jsf/4.20 Unions and Bit Fields/AV Rule 154.ql

@@ -18,7 +18,7 @@ import cpp
 from BitField bf
 where not bf.getUnspecifiedType().(IntegralType).isUnsigned()
   and not bf.getUnderlyingType() instanceof Enum
-  and not bf.getUnderlyingType().getUnspecifiedType() instanceof BoolType
+  and not bf.getUnspecifiedType() instanceof BoolType
   and not bf.getType().hasName("BOOL") // At least for C programs on Windows, BOOL is a common typedef for a type representing BoolType.
   and not bf.getDeclaredNumBits() = bf.getType().getSize() * 8 // If this is true, then there cannot be unsigned sign extension or overflow.
   and not bf.isAnonymous()

cpp/ql/src/jsf/4.21 Operators/AV Rule 164.ql

@@ -23,7 +23,7 @@ predicate possibleValue(Variable v, Expr value) {
 }
 
 predicate constantValue(Expr e, int value) {
-  e.getType().getUnderlyingType().getUnspecifiedType() instanceof IntegralType and
+  e.getUnspecifiedType() instanceof IntegralType and
   (
     // Either the expr has a constant value
     value = e.getValue().toInt() or

cpp/ql/src/jsf/4.23 Type Conversions/AV Rule 182.ql

@@ -19,8 +19,8 @@ class NullPointer extends Expr {
 }
 
 from Expr e, Type t1, Type t2
-where t1 = e.getUnderlyingType().getUnspecifiedType() and
-      t2 = e.getActualType().getUnderlyingType().getUnspecifiedType() and
+where t1 = e.getUnspecifiedType() and
+      t2 = e.getActualType().getUnspecifiedType() and
       t1 != t2 and
       (t1 instanceof PointerType or t2 instanceof PointerType) and
       not (t2 instanceof VoidPointerType and t1 instanceof PointerType) and

cpp/ql/src/semmle/code/cpp/commons/StructLikeClass.qll

@@ -88,7 +88,7 @@ predicate getter(MemberVariable v, MemberFunction f, Class c) {
  */
 predicate sameBaseType(Type t1, Type t2) {
   exists (Type base1, Type base2 |
-    base1 = t1.getUnderlyingType().getUnspecifiedType() and
+    base1 = t1.getUnspecifiedType() and
     base2 = t2.getUnspecifiedType().getUnspecifiedType() and
     (
       base1 = base2 or