Mercurial > hg > graal-jvmci-8
changeset 16446:4584f29431be
check phi types in during PEA state merging
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Thu, 10 Jul 2014 10:20:55 +0200 |
parents | eff9559f4515 |
children | ce6696559683 |
files | graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Tue Jul 08 16:25:10 2014 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Thu Jul 10 10:20:55 2014 +0200 @@ -457,6 +457,9 @@ phis[valueIndex] = new ValuePhiNode(values[valueIndex].stamp().unrestricted(), merge); } } + if (phis[valueIndex] != null && !phis[valueIndex].stamp().isCompatible(values[valueIndex].stamp())) { + phis[valueIndex] = new ValuePhiNode(values[valueIndex].stamp().unrestricted(), merge); + } if (twoSlotKinds != null && twoSlotKinds[valueIndex] != null) { // skip an entry after a long/double value that occupies two int slots valueIndex++;