BuiltInTypeRules: Rename getRealSize to getBuiltInSize

Author: lcartey

cpp/misra/src/codingstandards/cpp/misra/BuiltInTypeRules.qll

@@ -85,19 +85,36 @@ newtype Signedness =
   Signed() or
   Unsigned()
 
-class CharacterType extends Type {
-  // The actual character type, which is either a plain char or a wide char
+/**
+ * A `Type` which is considered to be a built-in type by MISRA.
+ *
+ * It differs from `BuiltInType` in that includes:
+ *  - Built in types with specifiers (e.g., `const`, `volatile`, `restrict`).
+ *  - Typedefs to built in types
+ *  - References to built in types
+ *  - Enum types with an explicit underlying type that is a built-in type.
+ */
+class MisraBuiltInType extends Type {
+  // The built in type underlying this MISRA built in type
   BuiltInType builtInType;
 
-  CharacterType() {
-    // A type whose type category is character
-    getBuiltInTypeCategory(builtInType) = Character() and
-    builtInType = getBuiltInType(this)
-  }
+  MisraBuiltInType() { builtInType = getBuiltInType(this) }
 
   private BuiltInType getBuiltInType() { result = builtInType }
 
-  predicate isSameType(CharacterType other) { this.getBuiltInType() = other.getBuiltInType() }
+  /** Gets the size of the underlying built in type. */
+  int getBuiltInSize() { result = builtInType.getSize() }
+
+  TypeCategory getTypeCategory() { result = getBuiltInTypeCategory(builtInType) }
+
+  predicate isSameType(MisraBuiltInType other) { this.getBuiltInType() = other.getBuiltInType() }
+}
+
+class CharacterType extends MisraBuiltInType {
+  CharacterType() {
+    // A type whose type category is character
+    getBuiltInTypeCategory(builtInType) = Character()
+  }
 }
 
 /**
@@ -108,25 +125,16 @@ class CharacterType extends Type {
  * - Typedef'd types that are numeric types.
  * - Numeric types with specifiers (e.g., `const`, `volatile`, `restrict`).
  */
-class NumericType extends Type {
-  // The actual numeric type, which is either an integral or a floating-point type.
-  BuiltInType builtInType;
-
+class NumericType extends MisraBuiltInType {
   NumericType() {
     // A type whose type category is either integral or a floating-point
-    getBuiltInTypeCategory(builtInType) = [Integral().(TypeCategory), FloatingPoint()] and
-    builtInType = getBuiltInType(this)
+    getBuiltInTypeCategory(builtInType) = [Integral().(TypeCategory), FloatingPoint()]
   }
 
   Signedness getSignedness() {
     if builtInType.(IntegralType).isUnsigned() then result = Unsigned() else result = Signed()
   }
 
-  /** Gets the size of the actual numeric type. */
-  int getRealSize() { result = builtInType.getSize() }
-
-  TypeCategory getTypeCategory() { result = getBuiltInTypeCategory(builtInType) }
-
   /**
    * Gets the integeral upper bound of the numeric type, if it represents an integer type.
    */
@@ -136,10 +144,6 @@ class NumericType extends Type {
    * Gets the integeral lower bound of the numeric type, if it represents an integer type.
    */
   QlBuiltins::BigInt getIntegralLowerBound() { integralTypeBounds(builtInType, result, _) }
-
-  private BuiltInType getBuiltInType() { result = builtInType }
-
-  predicate isSameType(NumericType other) { this.getBuiltInType() = other.getBuiltInType() }
 }
 
 predicate isSignedType(NumericType t) { t.getSignedness() = Signed() }
@@ -300,7 +304,7 @@ CanonicalIntegerNumericType getBitFieldType(BitField bf) {
       other.getSize() * 8 >= bf.getNumBits() and
       other.getSignedness() = result.getSignedness()
     |
-      other.getSize() < result.getRealSize()
+      other.getSize() < result.getBuiltInSize()
     )
   )
 }

cpp/misra/src/rules/RULE-7-0-5/NoSignednessChangeFromPromotion.ql

@@ -89,9 +89,9 @@ class IntegerPromotion extends IntegerPromotionOrUsualArithmeticConversionAsCast
     // Only consider cases where the integer promotion is the last conversion applied
     exists(Expr e | e.getFullyConverted() = this) and
     // Integer promotion occurs where the from type is smaller than int
-    fromType.getRealSize() < sizeOfInt() and
+    fromType.getBuiltInSize() < sizeOfInt() and
     // To type is bigger than or equal to int
-    toType.getRealSize() >= sizeOfInt() and
+    toType.getBuiltInSize() >= sizeOfInt() and
     // An integer promotion is a conversion from an integral type to an integral type
     //
     // This deliberately excludes integer promotions from `bool` and unscoped enums which do not
@@ -152,7 +152,7 @@ class ImpliedIntegerPromotion extends IntegerPromotionOrUsualArithmeticConversio
     fromType = this.getType() and
     fromType.getTypeCategory() = Integral() and
     // If the size is less than int, then it is an implied integer promotion
-    fromType.getRealSize() < sizeOfInt()
+    fromType.getBuiltInSize() < sizeOfInt()
   }
 
   override NumericType getFromType() { result = fromType }

cpp/misra/src/rules/RULE-7-0-6/NumericAssignmentTypeMismatch.ql

@@ -57,7 +57,7 @@ predicate isValidTypeMatch(NumericType sourceType, NumericType targetType) {
   // Same type category, signedness and size
   sourceType.getTypeCategory() = targetType.getTypeCategory() and
   sourceType.getSignedness() = targetType.getSignedness() and
-  sourceType.getRealSize() = targetType.getRealSize()
+  sourceType.getBuiltInSize() = targetType.getBuiltInSize()
 }
 
 /**
@@ -118,7 +118,7 @@ predicate isValidWidening(Expr source, NumericType sourceType, NumericType targe
   ) and
   sourceType.getTypeCategory() = targetType.getTypeCategory() and
   sourceType.getSignedness() = targetType.getSignedness() and
-  sourceType.getRealSize() < targetType.getRealSize()
+  sourceType.getBuiltInSize() < targetType.getBuiltInSize()
 }
 
 /**