wip

tokiwa-software · Jan 21, 2025 · 31eab97 · 31eab97
1 parent 5e64e15
commit 31eab97
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/dev/flang/fuir/analysis/dfa/DfaFUIR.java b/src/dev/flang/fuir/analysis/dfa/DfaFUIR.java
@@ -170,16 +170,16 @@ public byte[] serialize()
                 !withinCode(s) ? false : alwaysResultsInVoid(s),
                 !withinCode(s) ? false : doesResultEscape(s),
                 !withinCode(s) ? null : codeAt(s),
-                !withinCode(s) ? NO_CLAZZ : codeAt(s) == ExprKind.Const ? constClazz(s) : NO_CLAZZ,
+                !withinCode(s) || codeAt(s) != ExprKind.Const ? NO_CLAZZ : constClazz(s) ,
                 !withinCode(s) ? null : codeAt(s) == ExprKind.Const ? constData(s) : null,
                 accessedClazz,
                 accessedClazz != NO_CLAZZ ? accessedClazzes(s) : null,
-                !withinCode(s) ? NO_CLAZZ : (codeAt(s) == ExprKind.Call || codeAt(s) == ExprKind.Assign) ? accessTargetClazz(s) : NO_CLAZZ,
-                !withinCode(s) ? NO_CLAZZ : codeAt(s) == ExprKind.Tag ? tagValueClazz(s) : NO_CLAZZ,
-                !withinCode(s) ? NO_CLAZZ : codeAt(s) == ExprKind.Assign ? assignedType(s) : NO_CLAZZ,
+                !withinCode(s) || !(codeAt(s) == ExprKind.Call || codeAt(s) == ExprKind.Assign) ? NO_CLAZZ : accessTargetClazz(s),
+                !withinCode(s) || codeAt(s) != ExprKind.Tag ? NO_CLAZZ : tagValueClazz(s),
+                !withinCode(s) || codeAt(s) != ExprKind.Assign ? NO_CLAZZ : assignedType(s),
                 !withinCode(s) || codeAt(s) != ExprKind.Box ? NO_CLAZZ : safe(()->boxValueClazz(s0), NO_CLAZZ),
                 !withinCode(s) || codeAt(s) != ExprKind.Box ? NO_CLAZZ : safe(()->boxResultClazz(s0), NO_CLAZZ),
-                !withinCode(s) ? NO_CLAZZ : codeAt(s) == ExprKind.Match ? matchStaticSubject(s0) : NO_CLAZZ,
+                !withinCode(s) || codeAt(s) != ExprKind.Match ? NO_CLAZZ : matchStaticSubject(s0),
                 !withinCode(s) ? -1 : codeAt(s) == ExprKind.Match ? matchCaseCount(s) : NO_CLAZZ,
                 !withinCode(s) ? null : codeAt(s) == ExprKind.Match ? matchCaseTags(s) : null,
                 !withinCode(s) ? null : codeAt(s) == ExprKind.Match ? matchCaseCode(s) : null,