++

cpg-language-java/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/java/ExpressionHandler.kt

@@ -242,24 +242,28 @@ class ExpressionHandler(lang: JavaLanguageFrontend) :
     ): de.fraunhofer.aisec.cpg.graph.statements.expressions.Expression {
         val fieldAccessExpr = expr.asFieldAccessExpr()
 
+        var baseType = unknownType()
+        var fieldType = unknownType()
         // We can "try" to resolve the field using JavaParser's logic. The main reason we WANT to do
         // this is to get information about system types, as long as we are not fully doing that on
         // our own.
-        var type =
-            try {
-                val symbol = fieldAccessExpr.resolve()
-                objectType(symbol.type.describe())
-            } catch (_: UnsolvedSymbolException) {
-                unknownType()
+        try {
+            val symbol = fieldAccessExpr.resolve()
+            baseType = frontend.typeOf(symbol.type)
+
+            if (symbol.isField) {
+                fieldType = objectType(symbol.asField().declaringType().qualifiedName)
             }
+        } catch (_: UnsolvedSymbolException) {}
 
         var base =
             handle(fieldAccessExpr.scope)
                 as de.fraunhofer.aisec.cpg.graph.statements.expressions.Expression
+        base.type = baseType
         return newMemberExpression(
             fieldAccessExpr.name.identifier,
             base,
-            type,
+            fieldType,
             operatorCode = ".",
             rawNode = fieldAccessExpr
         )

cpg-language-java/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/java/JavaLanguageFrontend.kt

@@ -143,6 +143,12 @@ open class JavaLanguageFrontend(language: Language<JavaLanguageFrontend>, ctx: T
                 scopeManager.addDeclaration(incl)
             }
 
+            // We create an implicit import for "java.lang.*"
+            val decl =
+                newImportDeclaration(Name("java.lang"), wildcardImport = true)
+                    .implicit("import java.lang.*")
+            scopeManager.addDeclaration(decl)
+
             if (namespaceDeclaration != null) {
                 scopeManager.leaveScope(namespaceDeclaration)
             }