Zlaski/cpp386a (#1753)

* [CPP-386] Cumulative patch.

* Restore dataflow libraries clobbered by my last commit.

Author: zlaski-semmle

cpp/ql/src/semmle/code/cpp/Class.qll

@@ -802,6 +802,8 @@ class ClassDerivation extends Locatable, @derivation {
   Class getBaseClass() {
     result = getBaseType().getUnderlyingType()
   }
+  
+  override string getCanonicalQLClass() { result = "ClassDerivation" }
 
   /**
    * Gets the type from which we are deriving, without resolving any

cpp/ql/src/semmle/code/cpp/File.qll

@@ -187,6 +187,8 @@ class Folder extends Container, @folder {
     result.hasLocationInfo(_, 0, 0, 0, 0)
   }
 
+  override string getCanonicalQLClass() { result = "Folder" }
+
   /**
    * DEPRECATED: Use `getLocation` instead.
    * Gets the URL of this folder.
@@ -259,6 +261,8 @@ class File extends Container, @file {
     result = Container.super.toString()
   }
 
+  override string getCanonicalQLClass() { result = "File" }
+
   override Location getLocation() {
     result.getContainer() = this and
     result.hasLocationInfo(_, 0, 0, 0, 0)
@@ -458,6 +462,8 @@ class HeaderFile extends File {
     exists(Include i | i.getIncludedFile() = this)
   }
 
+  override string getCanonicalQLClass() { result = "HeaderFile" }
+
   /**
    * Holds if this header file does not contain any declaration entries or top level
    * declarations.  For example it might be:
@@ -488,6 +494,7 @@ class CFile extends File {
     )
   }
 
+  override string getCanonicalQLClass() { result = "CFile" }
 }
 
 /**
@@ -507,6 +514,7 @@ class CppFile extends File {
     )
   }
 
+  override string getCanonicalQLClass() { result = "CppFile" }
 }
 
 /**

cpp/ql/src/semmle/code/cpp/FriendDecl.qll

@@ -21,6 +21,8 @@ class FriendDecl extends Declaration, @frienddecl {
    * use `getFriend`.
    */
   override Location getADeclarationLocation() { result = this.getLocation() }
+  
+  override string getCanonicalQLClass() { result = "FriendDecl" }
 
   /**
    * Implements the abstract method `Declaration.getDefinitionLocation`. A

cpp/ql/src/semmle/code/cpp/Macro.qll

@@ -82,6 +82,8 @@ class MacroAccess extends Locatable, @macroinvocation {
     result = this.getOutermostMacroAccess().getActualLocation()
   }
 
+  override string getCanonicalQLClass() { result = "MacroAccess" }
+
   /**
    * Gets the location of this macro access. For a nested access, where
    * `exists(this.getParentInvocation())`, this yields a location either inside
@@ -158,6 +160,8 @@ class MacroInvocation extends MacroAccess {
     macroinvocations(underlyingElement(this),_,_,1)
   }
 
+  override string getCanonicalQLClass() { result = "MacroInvocation" }
+  
   /**
    * Gets an element that occurs in this macro invocation or a nested macro
    * invocation.

cpp/ql/src/semmle/code/cpp/Namespace.qll

@@ -132,6 +132,8 @@ class NamespaceDeclarationEntry extends Locatable, @namespace_decl {
    * example: the "{ ... }" in "namespace N { ... }".
    */
   Location getBodyLocation() { namespace_decls(underlyingElement(this),_,_,result) }
+
+  override string getCanonicalQLClass() { result = "NamespaceDeclarationEntry" }
 }
 
 /**

cpp/ql/src/semmle/code/cpp/Preprocessor.qll

@@ -158,6 +158,8 @@ class PreprocessorIf extends PreprocessorBranch, @ppd_if {
  */
 class PreprocessorIfdef extends PreprocessorBranch, @ppd_ifdef {
   override string toString() { result = "#ifdef " + this.getHead() }
+
+  override string getCanonicalQLClass() { result = "PreprocessorIfdef" }
 }
 
 /**

cpp/ql/src/semmle/code/cpp/Specifier.qll

@@ -13,6 +13,8 @@ class Specifier extends Element, @specifier {
     result instanceof UnknownDefaultLocation
   }
 
+  override string getCanonicalQLClass() { result = "Specifier" }
+  
   /** Gets the name of this specifier. */
   string getName() { specifiers(underlyingElement(this),result) }
 
@@ -31,6 +33,7 @@ class FunctionSpecifier extends Specifier {
     this.hasName("virtual") or
     this.hasName("explicit")
   }
+  override string getCanonicalQLClass() { result = "FunctionSpecifier)" }
 }
 
 /**
@@ -45,6 +48,7 @@ class StorageClassSpecifier extends Specifier {
     this.hasName("extern") or
     this.hasName("mutable")
   }
+  override string getCanonicalQLClass() { result = "StorageClassSpecifier" }
 }
 
 /**
@@ -96,6 +100,7 @@ class AccessSpecifier extends Specifier {
       baseAccess.getName() >= this.getName() and result = this
     )
   }
+  override string getCanonicalQLClass() { result = "AccessSpecifier" }
 }
 
 /**
@@ -237,6 +242,7 @@ class FormatAttribute extends GnuAttribute {
       not val = 0 // indicates a `vprintf` style format function with arguments not directly available.
     )
   }
+  override string getCanonicalQLClass() { result = "FormatAttribute" }
 }
 
 /**

cpp/ql/src/semmle/code/cpp/Type.qll

@@ -798,6 +798,8 @@ class Decltype extends Type, @decltype {
     decltypes(underlyingElement(this), _, unresolveElement(result), _)
   }
 
+  override string getCanonicalQLClass() { result = "Decltype" }
+
   /**
    * Whether an extra pair of parentheses around the expression would change the semantics of this decltype.
    *
@@ -1064,6 +1066,8 @@ class GNUVectorType extends DerivedType {
    */
   int getNumElements() { arraysizes(underlyingElement(this),result,_,_) }
 
+  override string getCanonicalQLClass() { result = "GNUVectorType" }
+
   /**
    * Gets the size, in bytes, of this vector type.
    *

cpp/ql/src/semmle/code/cpp/controlflow/Nullness.qll

@@ -14,8 +14,6 @@ abstract class NullValue extends Expr
 class Zero extends NullValue
 {
   Zero() { this.(Literal).getValue() = "0" }
-
-  override string getCanonicalQLClass() { result = "Zero" }
 }
 
 /**

cpp/ql/src/semmle/code/cpp/exprs/Access.qll

@@ -150,6 +150,7 @@ class FieldAccess extends VariableAccess {
  * so this is equivalent to `(*obj).field`.
  */
 class PointerFieldAccess extends FieldAccess {
+  override string getCanonicalQLClass() { result = "PointerFieldAccess" }
   PointerFieldAccess() {
     exists (PointerType t
     | t = getQualifier().getFullyConverted().getUnspecifiedType() and
@@ -164,6 +165,7 @@ class PointerFieldAccess extends FieldAccess {
  * distinguish whether or not the type of `obj` is a reference type.
  */
 class DotFieldAccess extends FieldAccess {
+  override string getCanonicalQLClass() { result = "DotFieldAccess" }
   DotFieldAccess() {
     exists (Class c
     | c = getQualifier().getFullyConverted().getUnspecifiedType())
@@ -175,6 +177,7 @@ class DotFieldAccess extends FieldAccess {
  * reference to a class/struct/union.
  */
 class ReferenceFieldAccess extends DotFieldAccess {
+  override string getCanonicalQLClass() { result = "ReferenceFieldAccess" }
   ReferenceFieldAccess() {
     exprHasReferenceConversion(this.getQualifier())
   }
@@ -185,6 +188,7 @@ class ReferenceFieldAccess extends DotFieldAccess {
  * class/struct/union (and not a reference).
  */
 class ValueFieldAccess extends DotFieldAccess {
+  override string getCanonicalQLClass() { result = "ValueFieldAccess" }
   ValueFieldAccess() {
     not exprHasReferenceConversion(this.getQualifier())
   }
@@ -226,6 +230,7 @@ private predicate exprHasReferenceConversion(Expr e) {
  * `ImplicitThisFieldAccess`.
  */
 class ImplicitThisFieldAccess extends FieldAccess {
+  override string getCanonicalQLClass() { result = "ImplicitThisFieldAccess" }
   ImplicitThisFieldAccess() {
     not exists (this.getQualifier())
   }
@@ -277,6 +282,7 @@ class ParamAccessForType extends Expr, @param_ref {
  * works on types directly rather than variables, expressions etc.
  */
 class TypeName extends Expr, @type_operand {
+  override string getCanonicalQLClass() { result = "TypeName" }
   override string toString() {
     result = this.getType().getName()
   }