Fix queries after merge from main

Author: jketema

cpp/common/src/codingstandards/cpp/Extensions.qll

@@ -108,18 +108,15 @@ class CPPTerseTernaryExtension extends CPPCompilerExtension, ConditionalExpr {
 }
 
 /**
- * A non-standard `Type` that is only available as a compiler extension, such as `__int128`,
- * `_Decimal32`, `_Decimal64`, `_Decimal128`, or `__float128`.
+ * A non-standard `Type` that is only available as a compiler extension, such as `__int128`
+ * or `__float128`.
  *
  * Reference: https://gcc.gnu.org/onlinedocs/gcc/__int128.html
  * Reference: https://gcc.gnu.org/onlinedocs/gcc/Decimal-Float.html
  */
 class CPPExtensionType extends Type {
   CPPExtensionType() {
     this instanceof Int128Type or
-    this instanceof Decimal128Type or
-    this instanceof Decimal32Type or
-    this instanceof Decimal64Type or
     this instanceof Float128Type
   }
 }

cpp/misra/src/rules/RULE-8-7-1/PointerArithmeticFormsAnInvalidPointer.ql

@@ -159,10 +159,10 @@ class ArrayAllocation extends TArrayAllocation {
    * array, and the minimum estimated value for a heap-allocated one.
    */
   int getLength(DataFlow::Node node) {
-    exists(IndirectUninitializedNode inode |
+    exists(DataFlow::IndirectUninitializedNode inode |
       inode = node and
       inode.getLocalVariable() = this.asStackAllocation().getVariable() and
-      result = this.asStackAllocation().getLength(inode.getIndirection())
+      result = this.asStackAllocation().getLength(inode.getIndirectionIndex())
     )
     or
     node.asUninitialized() = this.asStackAllocation().getVariable() and
@@ -193,33 +193,6 @@ class ArrayAllocation extends TArrayAllocation {
   }
 }
 
-/*
- * NOTE: `IndirectUninitializedNode` has made its way into `github/codeql`. Once we upgrade it to
- * the version that has it, the class can be safely removed.
- */
-
-import semmle.code.cpp.ir.dataflow.internal.SsaInternals as SsaImpl
-
-class IndirectUninitializedNode extends Node {
-  LocalVariable v;
-  int indirection;
-
-  IndirectUninitializedNode() {
-    exists(SsaImpl::Definition def, SsaImpl::SourceVariable sv |
-      def.getIndirectionIndex() = indirection and
-      indirection > 0 and
-      def.getValue().asInstruction() instanceof UninitializedInstruction and
-      SsaImpl::defToNode(this, def, sv) and
-      v = sv.getBaseVariable().(SsaImpl::BaseIRVariable).getIRVariable().getAst()
-    )
-  }
-
-  /** Gets the uninitialized local variable corresponding to this node. */
-  LocalVariable getLocalVariable() { result = v }
-
-  int getIndirection() { result = indirection }
-}
-
 newtype TPointerFormation =
   TArrayExpr(ArrayExprBA arrayExpr) or
   TPointerArithmetic(PointerArithmeticOperation pointerArithmetic) or