Mercurial > hg > graal-jvmci-8
diff src/share/vm/graal/graalCodeInstaller.cpp @ 18186:ef357effbda7
Backout of changeset 9a804ec7f707 (converted Constant and Value to be interfaces).
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Thu, 30 Oct 2014 11:18:48 +0100 |
parents | 37be28df9dd7 |
children | 9619ba4daf4c |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp Wed Oct 29 15:23:46 2014 +0100 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Thu Oct 30 11:18:48 2014 +0100 @@ -191,7 +191,7 @@ if (constant->is_a(HotSpotMetaspaceConstant::klass())) { oop obj = HotSpotMetaspaceConstant::metaspaceObject(constant); jlong prim = HotSpotMetaspaceConstant::primitive(constant); - assert(Kind::typeChar(AbstractConstant::kind(constant)) == 'j', "must have word kind"); + assert(Kind::typeChar(Constant::kind(constant)) == 'j', "must have word kind"); assert(obj != NULL, "must have an object"); assert(prim != 0, "must have a primitive value"); @@ -209,7 +209,7 @@ return _illegal_value; } - oop lirKind = AbstractValue::lirKind(value); + oop lirKind = Value::lirKind(value); oop platformKind = LIRKind::platformKind(lirKind); jint referenceMask = LIRKind::referenceMask(lirKind); assert(referenceMask == 0 || referenceMask == 1, "unexpected referenceMask"); @@ -288,7 +288,7 @@ second = value; } return value; - } else if (value->is_a(AbstractConstant::klass())){ + } else if (value->is_a(Constant::klass())){ record_metadata_in_constant(value, oop_recorder); if (value->is_a(PrimitiveConstant::klass())) { assert(!reference, "unexpected primitive constant type");