T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle non-ssa Vars and Enumerator constants in Rtl substitutions

Browse Source
This commit is contained in:
Dimo
2017-07-24 15:15:51 -07:00
committed by Jakob Stoklund Olesen
parent 776af93ef2
commit 20d96a1ac4
2 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/cretonne/meta/cdsl/ast.py
View File

@@ -402,16 +402,30 @@ class Apply(Expr):
if self.inst != other.inst:
return None
# TODO: Should we check imm/cond codes here as well?
for i in self.inst.value_opnums:
self_a = self.args[i]
other_a = other.args[i]
# Guaranteed by self.inst == other.inst
assert (len(self.args) == len(other.args))
assert isinstance(self_a, Var) and isinstance(other_a, Var)
if (self_a not in s):
s[self_a] = other_a
for (self_a, other_a) in zip(self.args, other.args):
if (isinstance(self_a, Var)):
if not isinstance(other_a, Var):
return None
if (self_a not in s):
s[self_a] = other_a
else:
if (s[self_a] != other_a):
return None
else:
if (s[self_a] != other_a):
assert isinstance(self_a, Enumerator)
if not isinstance(other_a, Enumerator):
# Currently don't support substitutions Var->Enumerator
return None
# Guaranteed by self.inst == other.inst
assert self_a.kind == other_a.kind
if (self_a.value != other_a.value):
return None
return s