# HG changeset patch
# User shade
# Date 1437787751 14400
# Node ID ed3e3cb35041d1517b31e76682c1a5a2377f86b2
# Parent  1a062ce57ce2d7b944d75a8f149cc8fc3f7a22ab
8131782: C1 Class.cast optimization breaks when Class is loaded from static final
Summary: change as_ValueType() to return InstanceConstant when appropriate
Reviewed-by: jrose

diff -r 1a062ce57ce2 -r ed3e3cb35041 hotspot/src/share/vm/c1/c1_ValueType.cpp
--- a/hotspot/src/share/vm/c1/c1_ValueType.cpp	Thu Jul 23 17:29:44 2015 +0100
+++ b/hotspot/src/share/vm/c1/c1_ValueType.cpp	Fri Jul 24 21:29:11 2015 -0400
@@ -153,7 +153,19 @@
     case T_FLOAT  : return new FloatConstant (value.as_float ());
     case T_DOUBLE : return new DoubleConstant(value.as_double());
     case T_ARRAY  : // fall through (ciConstant doesn't have an array accessor)
-    case T_OBJECT : return new ObjectConstant(value.as_object());
+    case T_OBJECT : {
+      // TODO: Common the code with GraphBuilder::load_constant?
+      ciObject* obj = value.as_object();
+      if (obj->is_null_object())
+        return objectNull;
+      if (obj->is_loaded()) {
+        if (obj->is_array())
+          return new ArrayConstant(obj->as_array());
+        else if (obj->is_instance())
+          return new InstanceConstant(obj->as_instance());
+      }
+      return new ObjectConstant(obj);
+    }
   }
   ShouldNotReachHere();
   return illegalType;