Mercurial > hg > truffle
changeset 18233:06bc22024f37
Merge
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Mon, 03 Nov 2014 16:49:28 -0800 |
parents | 31832ebd40cf (current diff) 95b2f8b8250e (diff) |
children | e2578a7a79ae |
files | |
diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineFrameStateBuilder.java Mon Nov 03 14:07:50 2014 -0800 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineFrameStateBuilder.java Mon Nov 03 16:49:28 2014 -0800 @@ -40,7 +40,7 @@ } @Override - protected Value[] getEmtpyArray() { + protected Value[] getEmptyArray() { return EMPTY_ARRAY; }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractFrameStateBuilder.java Mon Nov 03 14:07:50 2014 -0800 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractFrameStateBuilder.java Mon Nov 03 16:49:28 2014 -0800 @@ -55,7 +55,7 @@ this.stackSize = other.stackSize; this.locals = other.locals.clone(); this.stack = other.stack.clone(); - this.lockedObjects = other.lockedObjects == getEmtpyArray() ? getEmtpyArray() : other.lockedObjects.clone(); + this.lockedObjects = other.lockedObjects == getEmptyArray() ? getEmptyArray() : other.lockedObjects.clone(); this.rethrowException = other.rethrowException; assert locals.length == method.getMaxLocals(); @@ -64,7 +64,7 @@ public abstract S copy(); - protected abstract T[] getEmtpyArray(); + protected abstract T[] getEmptyArray(); public abstract boolean isCompatibleWith(S other); @@ -371,7 +371,7 @@ stackindex += stackSlots(element.getKind()); } stackSize = base; - return r.toArray(getEmtpyArray()); + return r.toArray(getEmptyArray()); } /**
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Mon Nov 03 14:07:50 2014 -0800 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Mon Nov 03 16:49:28 2014 -0800 @@ -95,7 +95,7 @@ } @Override - protected ValueNode[] getEmtpyArray() { + protected ValueNode[] getEmptyArray() { return EMPTY_ARRAY; }