Fix bug with -O2 and optimization

Author: boriel

src/api/optimize.py

@@ -159,10 +159,17 @@ def visit_BLOCK(self, node):
 class FunctionGraphVisitor(UniqueVisitor):
     """ Mark FUNCALLS
     """
+    def _get_calls_from_children(self, node):
+        return [
+            symbol
+            for symbol in self.filter_inorder(node, lambda x: isinstance(x, (symbols.FUNCCALL, symbols.CALL)))
+            if not isinstance(symbol, symbols.ARRAYACCESS)
+        ]
+
     def _set_children_as_accessed(self, node: symbols.SYMBOL):
         parent = node.get_parent(symbols.FUNCDECL)
         if parent is None:  # Global scope?
-            for symbol in self.filter_inorder(node, lambda x: isinstance(x, (symbols.FUNCCALL, symbols.CALL))):
+            for symbol in self._get_calls_from_children(node):
                 symbol.entry.accessed = True
 
     def visit_FUNCCALL(self, node: symbols.SYMBOL):
@@ -175,7 +182,7 @@ def visit_CALL(self, node: symbols.SYMBOL):
 
     def visit_FUNCDECL(self, node: symbols.SYMBOL):
         if node.entry.accessed:
-            for symbol in self.filter_inorder(node, lambda x: isinstance(x, (symbols.FUNCCALL, symbols.CALL))):
+            for symbol in self._get_calls_from_children(node):
                 symbol.entry.accessed = True
 
         yield node

tests/functional/opt2_global_array.asm

@@ -0,0 +1,50 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+__CALL_BACK__:
+	DEFW 0
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	call _Init
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	pop iy
+	pop ix
+	exx
+	ei
+	ret
+_Init:
+	push ix
+	ld ix, 0
+	add ix, sp
+	ld hl, 0
+	push hl
+	inc sp
+_Init__leave:
+	ld sp, ix
+	pop ix
+	ret
+	;; --- end of user code ---
+	END

tests/functional/opt2_global_array.bas

@@ -0,0 +1,8 @@
+DIM myArray(1 to 6) as ubyte
+
+SUB Init()
+    DIM i as ubyte
+    myArray(i) = 0
+END SUB
+
+Init()