# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1415062168 28800
# Node ID 06bc22024f371e662c54c8a4c52f3392eb73342f
# Parent  31832ebd40cf45ba15a9708bbddd37d61979f29a# Parent  95b2f8b8250e41c05eda5e4c7ce5e3be8c3c3c8d
Merge

diff -r 31832ebd40cf -r 06bc22024f37 graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineFrameStateBuilder.java
--- 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;
     }
 
diff -r 31832ebd40cf -r 06bc22024f37 graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractFrameStateBuilder.java
--- 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());
     }
 
     /**
diff -r 31832ebd40cf -r 06bc22024f37 graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java
--- 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;
     }