Revert "Merge pull request #8515 from rdmarsh2/rdmarsh2/ir-global-vars"

This reverts commit 800e4ea7df, reversing
changes made to 7ce040f331.

csharp/ql/src/experimental/ir/implementation/IRConfiguration.qll

@@ -16,7 +16,7 @@ class IRConfiguration extends TIRConfiguration {
   /**
    * Holds if IR should be created for function `func`. By default, holds for all functions.
    */
-  predicate shouldCreateIRForFunction(Language::Declaration func) { any() }
+  predicate shouldCreateIRForFunction(Language::Function func) { any() }
 
   /**
    * Holds if the strings used as part of an IR dump should be generated for function `func`.
@@ -25,7 +25,7 @@ class IRConfiguration extends TIRConfiguration {
    * of debug strings for IR that will not be dumped. We still generate the actual IR for these
    * functions, however, to preserve the results of any interprocedural analysis.
    */
-  predicate shouldEvaluateDebugStringsForFunction(Language::Declaration func) { any() }
+  predicate shouldEvaluateDebugStringsForFunction(Language::Function func) { any() }
 }
 
 private newtype TIREscapeAnalysisConfiguration = MkIREscapeAnalysisConfiguration()

csharp/ql/src/experimental/ir/implementation/internal/IRFunctionBase.qll

@@ -5,28 +5,23 @@
 private import IRFunctionBaseInternal
 
 private newtype TIRFunction =
-  TFunctionIRFunction(Language::Function func) { IRConstruction::Raw::functionHasIR(func) } or
-  TVarInitIRFunction(Language::GlobalVariable var) { IRConstruction::Raw::varHasIRFunc(var) }
+  MkIRFunction(Language::Function func) { IRConstruction::Raw::functionHasIR(func) }
 
 /**
  * The IR for a function. This base class contains only the predicates that are the same between all
  * phases of the IR. Each instantiation of `IRFunction` extends this class.
  */
 class IRFunctionBase extends TIRFunction {
-  Language::Declaration decl;
+  Language::Function func;
 
-  IRFunctionBase() {
-    this = TFunctionIRFunction(decl)
-    or
-    this = TVarInitIRFunction(decl)
-  }
+  IRFunctionBase() { this = MkIRFunction(func) }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = "IR: " + decl.toString() }
+  final string toString() { result = "IR: " + func.toString() }
 
   /** Gets the function whose IR is represented. */
-  final Language::Declaration getFunction() { result = decl }
+  final Language::Function getFunction() { result = func }
 
   /** Gets the location of the function. */
-  final Language::Location getLocation() { result = decl.getLocation() }
+  final Language::Location getLocation() { result = func.getLocation() }
 }

csharp/ql/src/experimental/ir/implementation/raw/IRBlock.qll

@@ -97,7 +97,7 @@ class IRBlockBase extends TIRBlock {
   /**
    * Gets the `Function` that contains this block.
    */
-  final Language::Declaration getEnclosingFunction() {
+  final Language::Function getEnclosingFunction() {
     result = getFirstInstruction(this).getEnclosingFunction()
   }
 }

csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll

@@ -194,7 +194,7 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the function that contains this instruction.
    */
-  final Language::Declaration getEnclosingFunction() {
+  final Language::Function getEnclosingFunction() {
     result = this.getEnclosingIRFunction().getFunction()
   }
 

csharp/ql/src/experimental/ir/implementation/raw/PrintIR.qll

@@ -26,20 +26,20 @@ class PrintIRConfiguration extends TPrintIRConfiguration {
    * Holds if the IR for `func` should be printed. By default, holds for all
    * functions.
    */
-  predicate shouldPrintFunction(Language::Declaration decl) { any() }
+  predicate shouldPrintFunction(Language::Function func) { any() }
 }
 
 /**
  * Override of `IRConfiguration` to only evaluate debug strings for the functions that are to be dumped.
  */
 private class FilteredIRConfiguration extends IRConfiguration {
-  override predicate shouldEvaluateDebugStringsForFunction(Language::Declaration func) {
+  override predicate shouldEvaluateDebugStringsForFunction(Language::Function func) {
     shouldPrintFunction(func)
   }
 }
 
-private predicate shouldPrintFunction(Language::Declaration decl) {
-  exists(PrintIRConfiguration config | config.shouldPrintFunction(decl))
+private predicate shouldPrintFunction(Language::Function func) {
+  exists(PrintIRConfiguration config | config.shouldPrintFunction(func))
 }
 
 private string getAdditionalInstructionProperty(Instruction instr, string key) {

csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll

@@ -46,9 +46,6 @@ module Raw {
   cached
   predicate functionHasIR(Callable callable) { exists(getTranslatedFunction(callable)) }
 
-  cached
-  predicate varHasIRFunc(Field field) { none() }
-
   cached
   predicate hasInstruction(TranslatedElement element, InstructionTag tag) {
     element.hasInstruction(_, tag, _)

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRBlock.qll

@@ -97,7 +97,7 @@ class IRBlockBase extends TIRBlock {
   /**
    * Gets the `Function` that contains this block.
    */
-  final Language::Declaration getEnclosingFunction() {
+  final Language::Function getEnclosingFunction() {
     result = getFirstInstruction(this).getEnclosingFunction()
   }
 }

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll

@@ -194,7 +194,7 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the function that contains this instruction.
    */
-  final Language::Declaration getEnclosingFunction() {
+  final Language::Function getEnclosingFunction() {
     result = this.getEnclosingIRFunction().getFunction()
   }
 

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/PrintIR.qll

@@ -26,20 +26,20 @@ class PrintIRConfiguration extends TPrintIRConfiguration {
    * Holds if the IR for `func` should be printed. By default, holds for all
    * functions.
    */
-  predicate shouldPrintFunction(Language::Declaration decl) { any() }
+  predicate shouldPrintFunction(Language::Function func) { any() }
 }
 
 /**
  * Override of `IRConfiguration` to only evaluate debug strings for the functions that are to be dumped.
  */
 private class FilteredIRConfiguration extends IRConfiguration {
-  override predicate shouldEvaluateDebugStringsForFunction(Language::Declaration func) {
+  override predicate shouldEvaluateDebugStringsForFunction(Language::Function func) {
     shouldPrintFunction(func)
   }
 }
 
-private predicate shouldPrintFunction(Language::Declaration decl) {
-  exists(PrintIRConfiguration config | config.shouldPrintFunction(decl))
+private predicate shouldPrintFunction(Language::Function func) {
+  exists(PrintIRConfiguration config | config.shouldPrintFunction(func))
 }
 
 private string getAdditionalInstructionProperty(Instruction instr, string key) {

csharp/ql/src/experimental/ir/internal/IRCSharpLanguage.qll

@@ -8,12 +8,6 @@ class OpaqueTypeTag = CSharp::ValueOrRefType;
 
 class Function = CSharp::Callable;
 
-class GlobalVariable extends CSharp::Field {
-  GlobalVariable() { this.isStatic() }
-}
-
-class Declaration = CSharp::Declaration;
-
 class Location = CSharp::Location;
 
 class UnknownLocation = CSharp::EmptyLocation;