# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1433447421 25200
# Node ID c2e90b2b3fcc45966bf2a415462cb2060a73b1f8
# Parent  27943aac2e3cc4ddde88707e7cffe7d0fa85b91c
Add missing null check

diff -r 27943aac2e3c -r c2e90b2b3fcc graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java	Thu Jun 04 11:08:12 2015 -0700
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java	Thu Jun 04 12:50:21 2015 -0700
@@ -269,7 +269,7 @@
                     assert index >= 0;
                     if (index % 4 == 0) {
                         stack.put(index / 4, null);
-                    } else {
+                    } else if (extraStack != null) {
                         extraStack.remove(v);
                     }
                 }