Fixed test

Fraunhofer-AISEC · Apr 11, 2024 · 7e9487b · 7e9487b
1 parent b6087c6
commit 7e9487b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/LanguageTraits.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/LanguageTraits.kt
@@ -27,7 +27,6 @@ package de.fraunhofer.aisec.cpg.frontends
 
 import de.fraunhofer.aisec.cpg.ScopeManager
 import de.fraunhofer.aisec.cpg.TranslationContext
-import de.fraunhofer.aisec.cpg.graph.Node
 import de.fraunhofer.aisec.cpg.graph.declarations.FunctionDeclaration
 import de.fraunhofer.aisec.cpg.graph.declarations.RecordDeclaration
 import de.fraunhofer.aisec.cpg.graph.declarations.TranslationUnitDeclaration
@@ -215,9 +214,7 @@ interface HasAnonymousIdentifier : LanguageTrait {
  * [GlobalScope], i.e., not within a namespace, but directly contained in a
  * [TranslationUnitDeclaration].
  */
-interface HasGlobalVariables : LanguageTrait {
-    val globalVariableScopeClass: Class<out Node>
-}
+interface HasGlobalVariables : LanguageTrait
 
 /**
  * A language trait, that specifies that the language has so-called functional style casts, meaning

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/SymbolResolver.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/SymbolResolver.kt
@@ -459,7 +459,7 @@ open class SymbolResolver(ctx: TranslationContext) : ComponentPass(ctx) {
 
         // This is a little bit of a workaround, but at least this makes sure we are not inferring a
         // record, where a namespace already exist
-        val (scope, _) = scopeManager.extractScope(reference)
+        val (scope, _) = scopeManager.extractScope(reference, null)
         return if (scope == null) {
             handleUnknownField(containingClass, reference)
         } else {

diff --git a/cpg-language-cxx/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CLanguage.kt b/cpg-language-cxx/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CLanguage.kt
@@ -27,8 +27,6 @@ package de.fraunhofer.aisec.cpg.frontends.cxx
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import de.fraunhofer.aisec.cpg.frontends.*
-import de.fraunhofer.aisec.cpg.graph.Node
-import de.fraunhofer.aisec.cpg.graph.declarations.TranslationUnitDeclaration
 import de.fraunhofer.aisec.cpg.graph.types.*
 import kotlin.reflect.KClass
 import org.neo4j.ogm.annotation.Transient
@@ -53,9 +51,6 @@ open class CLanguage :
 
     val unaryOperators = listOf("--", "++", "-", "+", "*", "&", "~")
 
-    override val globalVariableScopeClass: Class<out Node>
-        get() = TranslationUnitDeclaration::class.java
-
     /**
      * All operators which perform and assignment and an operation using lhs and rhs. See
      * https://en.cppreference.com/w/c/language/operator_assignment