C++: Make IRVariable non-abstract

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll

@@ -16,27 +16,35 @@ IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var
  * be a user-declared variable (`IRUserVariable`) or a temporary variable
  * generated by the AST-to-IR translation (`IRTempVariable`).
  */
-abstract class IRVariable extends TIRVariable {
+class IRVariable extends TIRVariable {
   Language::Function func;
 
-  abstract string toString();
+  string toString() {
+    none()
+  }
 
   /**
    * Gets the type of the variable.
    */
-  abstract Language::Type getType();
+  Language::Type getType() {
+    none()
+  }
 
   /**
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  abstract Language::AST getAST();
+  Language::AST getAST() {
+    none()
+  }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
    * within the function.
    */
-  abstract string getUniqueId();
+  string getUniqueId() {
+    none()
+  }
 
   /**
    * Gets the source location of this variable.
@@ -100,10 +108,14 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
  * stack. This includes all parameters, non-static local variables, and
  * temporary variables.
  */
-abstract class IRAutomaticVariable extends IRVariable {
+class IRAutomaticVariable extends IRVariable {
+  IRAutomaticVariable() {
+    this instanceof IRAutomaticUserVariable or
+    this instanceof IRTempVariable
+  }
 }
 
-class IRAutomaticUserVariable extends IRUserVariable, IRAutomaticVariable {
+class IRAutomaticUserVariable extends IRUserVariable {
   override Language::AutomaticVariable var;
 
   IRAutomaticUserVariable() {
@@ -132,7 +144,7 @@ IRTempVariable getIRTempVariable(Language::AST ast, TempVariableTag tag) {
   result.getTag() = tag
 }
 
-class IRTempVariable extends IRVariable, IRAutomaticVariable, TIRTempVariable {
+class IRTempVariable extends IRVariable, TIRTempVariable {
   Language::AST ast;
   TempVariableTag tag;
   Language::Type type;

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRVariable.qll

@@ -16,27 +16,35 @@ IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var
  * be a user-declared variable (`IRUserVariable`) or a temporary variable
  * generated by the AST-to-IR translation (`IRTempVariable`).
  */
-abstract class IRVariable extends TIRVariable {
+class IRVariable extends TIRVariable {
   Language::Function func;
 
-  abstract string toString();
+  string toString() {
+    none()
+  }
 
   /**
    * Gets the type of the variable.
    */
-  abstract Language::Type getType();
+  Language::Type getType() {
+    none()
+  }
 
   /**
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  abstract Language::AST getAST();
+  Language::AST getAST() {
+    none()
+  }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
    * within the function.
    */
-  abstract string getUniqueId();
+  string getUniqueId() {
+    none()
+  }
 
   /**
    * Gets the source location of this variable.
@@ -100,10 +108,14 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
  * stack. This includes all parameters, non-static local variables, and
  * temporary variables.
  */
-abstract class IRAutomaticVariable extends IRVariable {
+class IRAutomaticVariable extends IRVariable {
+  IRAutomaticVariable() {
+    this instanceof IRAutomaticUserVariable or
+    this instanceof IRTempVariable
+  }
 }
 
-class IRAutomaticUserVariable extends IRUserVariable, IRAutomaticVariable {
+class IRAutomaticUserVariable extends IRUserVariable {
   override Language::AutomaticVariable var;
 
   IRAutomaticUserVariable() {
@@ -132,7 +144,7 @@ IRTempVariable getIRTempVariable(Language::AST ast, TempVariableTag tag) {
   result.getTag() = tag
 }
 
-class IRTempVariable extends IRVariable, IRAutomaticVariable, TIRTempVariable {
+class IRTempVariable extends IRVariable, TIRTempVariable {
   Language::AST ast;
   TempVariableTag tag;
   Language::Type type;

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll

@@ -16,27 +16,35 @@ IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var
  * be a user-declared variable (`IRUserVariable`) or a temporary variable
  * generated by the AST-to-IR translation (`IRTempVariable`).
  */
-abstract class IRVariable extends TIRVariable {
+class IRVariable extends TIRVariable {
   Language::Function func;
 
-  abstract string toString();
+  string toString() {
+    none()
+  }
 
   /**
    * Gets the type of the variable.
    */
-  abstract Language::Type getType();
+  Language::Type getType() {
+    none()
+  }
 
   /**
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  abstract Language::AST getAST();
+  Language::AST getAST() {
+    none()
+  }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
    * within the function.
    */
-  abstract string getUniqueId();
+  string getUniqueId() {
+    none()
+  }
 
   /**
    * Gets the source location of this variable.
@@ -100,10 +108,14 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
  * stack. This includes all parameters, non-static local variables, and
  * temporary variables.
  */
-abstract class IRAutomaticVariable extends IRVariable {
+class IRAutomaticVariable extends IRVariable {
+  IRAutomaticVariable() {
+    this instanceof IRAutomaticUserVariable or
+    this instanceof IRTempVariable
+  }
 }
 
-class IRAutomaticUserVariable extends IRUserVariable, IRAutomaticVariable {
+class IRAutomaticUserVariable extends IRUserVariable {
   override Language::AutomaticVariable var;
 
   IRAutomaticUserVariable() {
@@ -132,7 +144,7 @@ IRTempVariable getIRTempVariable(Language::AST ast, TempVariableTag tag) {
   result.getTag() = tag
 }
 
-class IRTempVariable extends IRVariable, IRAutomaticVariable, TIRTempVariable {
+class IRTempVariable extends IRVariable, TIRTempVariable {
   Language::AST ast;
   TempVariableTag tag;
   Language::Type type;