comparison src/share/vm/graal/graalCodeInstaller.cpp @ 8589:ec06c7e67698

renamed MonitorValue to HotSpotMonitorValue and moved it to com.oracle.graal.hotspot project
author Doug Simon <doug.simon@oracle.com>
date Fri, 29 Mar 2013 14:19:04 +0100
parents 8a526d8b4604
children 707b20dd9512 a8fea2979e63
comparison
equal deleted inserted replaced
8588:b5eff8bd82da 8589:ec06c7e67698
261 ShouldNotReachHere(); 261 ShouldNotReachHere();
262 return NULL; 262 return NULL;
263 } 263 }
264 264
265 static MonitorValue* get_monitor_value(oop value, int total_frame_size, GrowableArray<ScopeValue*>* objects, OopRecorder* oop_recorder) { 265 static MonitorValue* get_monitor_value(oop value, int total_frame_size, GrowableArray<ScopeValue*>* objects, OopRecorder* oop_recorder) {
266 guarantee(value->is_a(code_MonitorValue::klass()), "Monitors must be of type MonitorValue"); 266 guarantee(value->is_a(HotSpotMonitorValue::klass()), "Monitors must be of type MonitorValue");
267 267
268 ScopeValue* second = NULL; 268 ScopeValue* second = NULL;
269 ScopeValue* owner_value = get_hotspot_value(code_MonitorValue::owner(value), total_frame_size, objects, second, oop_recorder); 269 ScopeValue* owner_value = get_hotspot_value(HotSpotMonitorValue::owner(value), total_frame_size, objects, second, oop_recorder);
270 assert(second == NULL, "monitor cannot occupy two stack slots"); 270 assert(second == NULL, "monitor cannot occupy two stack slots");
271 271
272 ScopeValue* lock_data_value = get_hotspot_value(code_MonitorValue::lockData(value), total_frame_size, objects, second, oop_recorder); 272 ScopeValue* lock_data_value = get_hotspot_value(HotSpotMonitorValue::slot(value), total_frame_size, objects, second, oop_recorder);
273 assert(second == lock_data_value, "monitor is LONG value that occupies two stack slots"); 273 assert(second == lock_data_value, "monitor is LONG value that occupies two stack slots");
274 assert(lock_data_value->is_location(), "invalid monitor location"); 274 assert(lock_data_value->is_location(), "invalid monitor location");
275 Location lock_data_loc = ((LocationValue*)lock_data_value)->location(); 275 Location lock_data_loc = ((LocationValue*)lock_data_value)->location();
276 276
277 bool eliminated = false; 277 bool eliminated = false;
278 if (code_MonitorValue::eliminated(value)) { 278 if (HotSpotMonitorValue::eliminated(value)) {
279 eliminated = true; 279 eliminated = true;
280 } 280 }
281 281
282 return new MonitorValue(owner_value, lock_data_loc, eliminated); 282 return new MonitorValue(owner_value, lock_data_loc, eliminated);
283 } 283 }