[CPP-386] Fix Local{Class,Struct,Union}, macro invocations,

          printing of member functions and operators.

Author: zlaski-semmle

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

@@ -824,7 +824,8 @@ class LocalClass extends Class {
     isLocal()
   }
 
-  override string getCanonicalQLClass() { result = "LocalClass" }
+  override string getCanonicalQLClass()
+    { not this instanceof LocalStruct and result = "LocalClass" }
 
   override Function getEnclosingAccessHolder() {
     result = this.getEnclosingFunction()
@@ -861,6 +862,8 @@ class AbstractClass extends Class {
   AbstractClass() {
     exists(PureVirtualFunction f| this.getAMemberFunction() = f)
   }
+
+  override string getCanonicalQLClass() { result = "AbstractClass" }
 }
 
 /**
@@ -873,6 +876,8 @@ class TemplateClass extends Class {
     result.isConstructedFrom(this) and
     exists(result.getATemplateArgument())
   }
+
+  override string getCanonicalQLClass() { result = "TemplateClass" }
 }
 
 /**
@@ -885,6 +890,8 @@ class ClassTemplateInstantiation extends Class {
     tc.getAnInstantiation() = this
   }
 
+  override string getCanonicalQLClass() { result = "ClassTemplateInstantiation" }
+
   /**
    * Gets the class template from which this instantiation was instantiated.
    *
@@ -916,6 +923,8 @@ abstract class ClassTemplateSpecialization extends Class {
     and count(TemplateParameter tp | tp = result.getATemplateArgument()) =
         count(int i | exists(result.getTemplateArgument(i)))
   }
+
+  override string getCanonicalQLClass() { result = "ClassTemplateSpecialization" }
 }
 
 /**
@@ -933,6 +942,8 @@ class FullClassTemplateSpecialization extends ClassTemplateSpecialization {
     // This class is not an instantiation of a class template.
     and not this instanceof ClassTemplateInstantiation
   }
+
+  override string getCanonicalQLClass() { result = "FullClassTemplateSpecialization" }
 }
 
 /**
@@ -957,6 +968,8 @@ class PartialClassTemplateSpecialization extends ClassTemplateSpecialization {
     and count(TemplateParameter tp | tp = getATemplateArgument()) !=
         count(int i | exists(getTemplateArgument(i)))
   }
+
+  override string getCanonicalQLClass() { result = "PartialClassTemplateSpecialization" }
 }
 
 /**
@@ -967,6 +980,8 @@ class Interface extends Class {
   Interface() {
     forex(Declaration m | m.getDeclaringType() = this.getABaseClass*() and not compgenerated(unresolveElement(m)) | m instanceof PureVirtualFunction)
   }
+
+  override string getCanonicalQLClass() { result = "Interface" }
 }
 
 /**
@@ -977,6 +992,8 @@ class VirtualClassDerivation extends ClassDerivation {
   VirtualClassDerivation() {
     hasSpecifier("virtual")
   }
+
+  override string getCanonicalQLClass() { result = "VirtualClassDerivation" }
 }
 
 /**

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

@@ -723,7 +723,9 @@ class MemberFunction extends Function {
   }
 
   override string getCanonicalQLClass() 
-    { not this instanceof Operator and result = "MemberFunction" }
+    { not this instanceof CopyAssignmentOperator and 
+      not this instanceof MoveAssignmentOperator and 
+      result = "MemberFunction" }
 
   /**
    * Gets the number of parameters of this function, including any implicit
@@ -864,7 +866,8 @@ class ConversionConstructor extends Constructor, ImplicitConversionFunction {
     and not(this instanceof CopyConstructor)
   }
 
-  override string getCanonicalQLClass() { result = "ConversionConstructor" }
+  override string getCanonicalQLClass() 
+    { not this instanceof MoveConstructor and result = "ConversionConstructor" }
 
   /** Gets the type this `ConversionConstructor` takes as input. */
   override Type getSourceType() { result = this.getParameter(0).getType() }
@@ -1046,7 +1049,8 @@ class Operator extends Function {
 
   Operator() { functions(underlyingElement(this),_,5) }
 
-  override string getCanonicalQLClass() { result = "Operator" }
+  override string getCanonicalQLClass() 
+    { not this instanceof MemberFunction and result = "Operator" }
 }
 
 /**

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

@@ -11,6 +11,8 @@ class Macro extends PreprocessorDirective, @ppd_define {
    */
   override string getHead() { preproctext(underlyingElement(this),result,_) }
 
+  override string getCanonicalQLClass() { result = "Macro" }
+
   /**
    * Gets the body of this macro. For example, `(((x)>(y))?(x):(y))` in
    * `#define MAX(x,y) (((x)>(y))?(x):(y))`.
@@ -275,6 +277,8 @@ deprecated class MacroInvocationExpr extends Expr {
     exists(MacroInvocation i | this = i.getExpr())
   }
 
+  override string getCanonicalQLClass() { result = "MacroInvocationExpr" }
+
   /**
    * Gets the macro invocation of which this is the top-level expression.
    */
@@ -301,6 +305,8 @@ deprecated class MacroInvocationStmt extends Stmt {
     exists(MacroInvocation i | this = i.getStmt())
   }
 
+  override string getCanonicalQLClass() { result = "MacroInvocationStmt" }
+
   /**
    * Gets the macro invocation of which this is the top-level statement.
    */

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

@@ -23,7 +23,8 @@ class LocalStruct extends Struct {
     isLocal()
   }
 
-  override string getCanonicalQLClass() { result = "LocalStruct" }
+  override string getCanonicalQLClass() 
+    { not this instanceof LocalUnion and result = "LocalStruct" }
 }
 
 /**

cpp/ql/src/semmle/code/cpp/stmts/Stmt.qll

@@ -1924,7 +1924,7 @@ class VlaDimensionStmt extends Stmt, @stmt_set_vla_size {
 class VlaDeclStmt extends Stmt, @stmt_vla_decl {
   override string toString() { result = "VLA declaration" }
 
-  override string getCanonicalQLClass() { result = "VlaDeclStmtlll;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" }
+  override string getCanonicalQLClass() { result = "VlaDeclStmt" }
 
   /**
    * Gets the number of VLA dimension statements in this VLA