Mercurial > hg > graal-compiler
changeset 9141:5cabfd00241e
merge
author | Michael Haupt <michael.haupt@oracle.com> |
---|---|
date | Tue, 16 Apr 2013 14:06:45 +0200 |
parents | 0a8d5ca4379c (diff) cf3c89ef00f7 (current diff) |
children | e178e4598f85 febfb532ed2f |
files | |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Apr 16 13:33:04 2013 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Apr 16 14:06:45 2013 +0200 @@ -285,7 +285,7 @@ ValueNode value; if (kind == Kind.Object) { value = frameState.xpop(); - // astore and astore_<n> may be used to store a returnAddress (jsr) see JVMS ยง6.5.astore + // astore and astore_<n> may be used to store a returnAddress (jsr) see JVMS par. 6.5.astore assert value.kind() == Kind.Object || value.kind() == Kind.Int; } else { value = frameState.pop(kind);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Tue Apr 16 13:33:04 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Tue Apr 16 14:06:45 2013 +0200 @@ -59,4 +59,9 @@ } } + @Override + public boolean verify() { + return stateAfter() != null && super.verify(); + } + }