# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1371810004 -7200
# Node ID f748b42a1389e4f4abfb57f96c9dda2508796ff6
# Parent  819251246143c7416ce3949a59b7e694ac2969cb# Parent  7381d7427f0f3ddb7d3ad38ac758ee8acb756837
Merge.

diff -r 819251246143 -r f748b42a1389 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java	Fri Jun 21 12:05:26 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java	Fri Jun 21 12:20:04 2013 +0200
@@ -126,7 +126,7 @@
         Word hub = loadWordFromObject(elementType, arrayKlassOffset());
         if (hub.equal(Word.zero())) {
             // the array class is not yet loaded
-            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.Unresolved);
+            DeoptimizeNode.deopt(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.Unresolved);
         }
 
         int layoutHelper = readLayoutHelper(hub);