--- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Tue Sep 01 18:58:12 2015 +0200
+++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Wed Sep 02 12:02:17 2015 +0200
@@ -166,7 +166,7 @@
   if (constant->is_a(HotSpotMetaspaceConstantImpl::klass())) {
     oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
     jlong prim = HotSpotMetaspaceConstantImpl::primitive(constant);
-    assert(Kind::typeChar(AbstractValue::kind(constant)) == 'j', "must have word kind");
+    assert(Kind::typeChar(Value::kind(constant)) == 'j', "must have word kind");
     assert(obj != NULL, "must have an object");
     assert(prim != 0, "must have a primitive value");
 
@@ -179,7 +179,7 @@
 }
 
 static Location::Type get_oop_type(oop value) {
-  oop lirKind = AbstractValue::lirKind(value);
+  oop lirKind = Value::lirKind(value);
   oop platformKind = LIRKind::platformKind(lirKind);
   assert(LIRKind::referenceMask(lirKind) == 1, "unexpected referenceMask");
   
@@ -192,7 +192,7 @@
 
 ScopeValue* CodeInstaller::get_scope_value(oop value, BasicType type, GrowableArray<ScopeValue*>* objects, ScopeValue* &second) {
   second = NULL;
-  if (value == AbstractValue::ILLEGAL()) {
+  if (value == Value::ILLEGAL()) {
     assert(type == T_ILLEGAL, "expected legal value");
     return _illegal_value;
   } else if (value->is_a(RegisterValue::klass())) {
@@ -811,7 +811,7 @@
       if (second != NULL) {
         i++;
         assert(i < values->length(), "double-slot value not followed by Value.ILLEGAL");
-        assert(values->obj_at(i) == AbstractValue::ILLEGAL(), "double-slot value not followed by Value.ILLEGAL");
+        assert(values->obj_at(i) == Value::ILLEGAL(), "double-slot value not followed by Value.ILLEGAL");
       }
     }