Overhaul of type propagation (#1268)

Co-authored-by: Alexander Kuechler <[email protected]> Co-authored-by: Maximilian Kaul <[email protected]>
Fraunhofer-AISEC · Aug 9, 2023 · 9638fff · 9638fff
1 parent 6192503
commit 9638fff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/Language.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/Language.kt
@@ -34,9 +34,11 @@ import de.fraunhofer.aisec.cpg.TranslationContext
 import de.fraunhofer.aisec.cpg.graph.Name
 import de.fraunhofer.aisec.cpg.graph.Node
 import de.fraunhofer.aisec.cpg.graph.statements.expressions.BinaryOperator
+import de.fraunhofer.aisec.cpg.graph.statements.expressions.CastExpression
 import de.fraunhofer.aisec.cpg.graph.types.*
 import de.fraunhofer.aisec.cpg.graph.types.Type
 import de.fraunhofer.aisec.cpg.graph.unknownType
+import de.fraunhofer.aisec.cpg.helpers.Util
 import java.io.File
 import kotlin.reflect.KClass
 import kotlin.reflect.full.primaryConstructor

diff --git a/...uage-cxx/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CXXLanguageFrontendTest.kt b/...uage-cxx/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CXXLanguageFrontendTest.kt
@@ -658,10 +658,17 @@ internal class CXXLanguageFrontendTest : BaseTest() {
         ref = assign.lhs<DeclaredReferenceExpression>()
         assertNotNull(ref)
         assertLocalName("a", ref)
+<<<<<<< HEAD
 
         binOp = assign.rhs<BinaryOperator>()
         assertNotNull(binOp)
 
+=======
+
+        binOp = assign.rhs<BinaryOperator>()
+        assertNotNull(binOp)
+
+>>>>>>> 490562dce (Overhaul of type propagation (#1268))
         assertTrue(binOp.lhs is Literal<*>)
         assertEquals(1, (binOp.lhs as Literal<*>).value)
         assertTrue(binOp.rhs is Literal<*>)