AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-03 00:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix lack of 'ref' in symbol table entries for labels

Browse source 
These were expected by the constant folder, causing a crash.
This commit is contained in:
Sei Lisa 2019-01-02 13:33:58 +01:00
parent 2d583bb7e3
commit ad71303eb0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lslopt/lslinliner.py
View file

@ -43,6 +43,7 @@ class inliner(object):
if 'NewSymbolName' in orig: if 'NewSymbolName' in orig:
node.name = orig['NewSymbolName'] node.name = orig['NewSymbolName']
node.scope = orig['NewSymbolScope'] node.scope = orig['NewSymbolScope']
self.symtab[node.scope][node.name]['ref'] += 1
return return
if nt in SINGLE_OPT_EXPR_CHILD_NODES: if nt in SINGLE_OPT_EXPR_CHILD_NODES:
@ -111,7 +112,7 @@ class inliner(object):
if copy.name in self.symtab[scope]: if copy.name in self.symtab[scope]:
raise ENameAlreadyExists( raise ENameAlreadyExists(
u"Label already exists: %s" % copy.name.decode('utf8')) u"Label already exists: %s" % copy.name.decode('utf8'))
self.symtab[scope][copy.name] = {'Type':'l', 'Scope':scope} self.symtab[scope][copy.name] = {'Type':'l','Scope':scope,'ref':0}
self.symtab[oldscope][oldname]['NewSymbolName'] = copy.name self.symtab[oldscope][oldname]['NewSymbolName'] = copy.name
self.symtab[oldscope][oldname]['NewSymbolScope'] = scope self.symtab[oldscope][oldname]['NewSymbolScope'] = scope
return copy return copy
@ -119,6 +120,7 @@ class inliner(object):
if nt == 'RETURN': if nt == 'RETURN':
newnode = nr(nt='JUMP', t=None, name=self.retlabel, newnode = nr(nt='JUMP', t=None, name=self.retlabel,
scope=self.retlscope) scope=self.retlscope)
self.symtab[self.retlscope][self.retlabel]['ref'] += 1
if node.ch: if node.ch:
# Returns a value. Wrap in {} and add an assignment. # Returns a value. Wrap in {} and add an assignment.
# BUG: We don't honour ExplicitCast here. # BUG: We don't honour ExplicitCast here.
@ -132,7 +134,6 @@ class inliner(object):
]), newnode ]), newnode
]) ])
self.symtab.append({}) self.symtab.append({})
self.retused = True
return newnode return newnode
if nt == 'IDENT': if nt == 'IDENT':
@ -204,15 +205,14 @@ class inliner(object):
self.lblCount += 1 self.lblCount += 1
retlabel = '___rtl__%05d' % self.lblCount retlabel = '___rtl__%05d' % self.lblCount
self.retlabel = retlabel self.retlabel = retlabel
self.symtab[scope][retlabel] = {'Type':'l', 'Scope':scope} self.symtab[scope][retlabel] = {'Type':'l', 'Scope':scope, 'ref':0}
# Get a copy of the function # Get a copy of the function
self.retused = False
blk = [self.GetFuncCopy(self.tree[fnsym['Loc']])] blk = [self.GetFuncCopy(self.tree[fnsym['Loc']])]
retused = self.retused
if outer: if outer:
outer.ch.extend(blk) outer.ch.extend(blk)
blk = [outer] blk = [outer]
retused = self.symtab[scope][retlabel]['ref'] != 0
self.RecurseStatement(blk, 0, scope) # recursively expand functions self.RecurseStatement(blk, 0, scope) # recursively expand functions