comparison src/share/vm/graal/graalCodeInstaller.cpp @ 18187:9619ba4daf4c

Rename Constant to JavaConstant.
author Roland Schatz <roland.schatz@oracle.com>
date Thu, 30 Oct 2014 12:21:07 +0100
parents ef357effbda7
children ff1f1481b367
comparison
equal deleted inserted replaced
18186:ef357effbda7 18187:9619ba4daf4c
189 // Records any Metadata values embedded in a Constant (e.g., the value returned by HotSpotResolvedObjectType.klass()). 189 // Records any Metadata values embedded in a Constant (e.g., the value returned by HotSpotResolvedObjectType.klass()).
190 static void record_metadata_in_constant(oop constant, OopRecorder* oop_recorder) { 190 static void record_metadata_in_constant(oop constant, OopRecorder* oop_recorder) {
191 if (constant->is_a(HotSpotMetaspaceConstant::klass())) { 191 if (constant->is_a(HotSpotMetaspaceConstant::klass())) {
192 oop obj = HotSpotMetaspaceConstant::metaspaceObject(constant); 192 oop obj = HotSpotMetaspaceConstant::metaspaceObject(constant);
193 jlong prim = HotSpotMetaspaceConstant::primitive(constant); 193 jlong prim = HotSpotMetaspaceConstant::primitive(constant);
194 assert(Kind::typeChar(Constant::kind(constant)) == 'j', "must have word kind"); 194 assert(Kind::typeChar(Value::kind(constant)) == 'j', "must have word kind");
195 assert(obj != NULL, "must have an object"); 195 assert(obj != NULL, "must have an object");
196 assert(prim != 0, "must have a primitive value"); 196 assert(prim != 0, "must have a primitive value");
197 197
198 record_metadata_reference(obj, prim, false, oop_recorder); 198 record_metadata_reference(obj, prim, false, oop_recorder);
199 } 199 }
286 ScopeValue* value = new LocationValue(Location::new_stk_loc(locationType, offset)); 286 ScopeValue* value = new LocationValue(Location::new_stk_loc(locationType, offset));
287 if (type == T_DOUBLE || (type == T_LONG && !reference)) { 287 if (type == T_DOUBLE || (type == T_LONG && !reference)) {
288 second = value; 288 second = value;
289 } 289 }
290 return value; 290 return value;
291 } else if (value->is_a(Constant::klass())){ 291 } else if (value->is_a(JavaConstant::klass())){
292 record_metadata_in_constant(value, oop_recorder); 292 record_metadata_in_constant(value, oop_recorder);
293 if (value->is_a(PrimitiveConstant::klass())) { 293 if (value->is_a(PrimitiveConstant::klass())) {
294 assert(!reference, "unexpected primitive constant type"); 294 assert(!reference, "unexpected primitive constant type");
295 if(value->is_a(RawConstant::klass())) { 295 if(value->is_a(RawConstant::klass())) {
296 jlong prim = PrimitiveConstant::primitive(value); 296 jlong prim = PrimitiveConstant::primitive(value);