review fixes

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/intermediatelang/optimizer/SideEffectAnalyzer.java

@@ -513,6 +513,9 @@ private boolean functionHasSideEffects(ImFunction func) {
         }
 
         private boolean hasGlobalSideEffects(Element elem) {
+            if (hasMemberWrites(elem)) {
+                return true;
+            }
             for (ImVar var : directlySetVariables(elem)) {
                 // Some optimization passes temporarily detach vars; in that state isGlobal() throws.
                 if (isAttachedGlobal(var)) {
@@ -532,6 +535,38 @@ private boolean hasGlobalSideEffects(Element elem) {
             return false;
         }
 
+        private boolean hasMemberWrites(Element elem) {
+            final boolean[] foundMemberWrite = {false};
+            elem.accept(new ImStmt.DefaultVisitor() {
+                @Override
+                public void visit(ImSet set) {
+                    super.visit(set);
+                    if (isMemberWrite(set.getLeft())) {
+                        foundMemberWrite[0] = true;
+                    }
+                }
+
+                private boolean isMemberWrite(ImLExpr left) {
+                    if (left instanceof ImMemberAccess) {
+                        return true;
+                    }
+                    if (left instanceof ImTupleSelection) {
+                        ImExpr tupleExpr = ((ImTupleSelection) left).getTupleExpr();
+                        return tupleExpr instanceof ImLExpr && isMemberWrite((ImLExpr) tupleExpr);
+                    }
+                    if (left instanceof ImTupleExpr) {
+                        for (ImExpr expr : ((ImTupleExpr) left).getExprs()) {
+                            if (expr instanceof ImLExpr && isMemberWrite((ImLExpr) expr)) {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }
+            });
+            return foundMemberWrite[0];
+        }
+
         private boolean isAttachedGlobal(ImVar var) {
             Element parent = var.getParent();
             return parent != null && parent.getParent() instanceof ImProg;

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/ImTranslator.java

@@ -185,8 +185,8 @@ public ImProg translateProg() {
 
     public void removeEmptyPackageInits() {
         Set<ImFunction> emptyInitFunctions = new HashSet<>();
-        for (ImFunction initFunc : imProg.getFunctions()) {
-            if (initFunc.getName().startsWith("init_") && isTrivialInitFunction(initFunc)) {
+        for (ImFunction initFunc : new LinkedHashSet<>(initFuncMap.values())) {
+            if (isTrivialInitFunction(initFunc)) {
                 emptyInitFunctions.add(initFunc);
             }
         }

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/OptimizerTests.java

@@ -629,6 +629,37 @@ public void deadStoreKeepsPotentialDivisionTrapInCallee() throws IOException {
         assertTrue(compiledNoOpt.contains("1 /"), "potential division trap in callee should be preserved");
     }
 
+    @Test
+    public void deadStoreKeepsObservableMemberMutationInCallee() {
+        testAssertOkLines(true,
+            "package test",
+            "native testSuccess()",
+            "class C",
+            "    int x",
+            "function mutate(C c) returns int",
+            "    c.x = 7",
+            "    return 1",
+            "init",
+            "    let c = new C",
+            "    int unused = mutate(c)",
+            "    if c.x == 7",
+            "        testSuccess()"
+        );
+    }
+
+    @Test
+    public void removeEmptyPackageInitsDoesNotPruneUserInitPrefixedFunctions() {
+        testAssertOkLines(true,
+            "package test",
+            "native testSuccess()",
+            "function init_user() returns bool",
+            "    return true",
+            "init",
+            "    if init_user()",
+            "        testSuccess()"
+        );
+    }
+
     @Test
     public void test_unreachableCodeRemover() throws IOException {
         test().withStdLib().lines(