Mercurial > hg > graal-jvmci-8
comparison src/share/vm/compiler/oopMap.cpp @ 14124:7ad529321294
make: remove GRAALVM and introduce COMPILERGRAAL. fix client hosted-mode
author | Bernhard Urban <bernhard.urban@jku.at> |
---|---|
date | Mon, 10 Mar 2014 16:26:10 +0100 |
parents | ce5e6f9075b6 |
children | 82ff6c8c8f6e |
comparison
equal
deleted
inserted
replaced
14123:dc41eab09fe8 | 14124:7ad529321294 |
---|---|
317 static DoNothingClosure do_nothing; | 317 static DoNothingClosure do_nothing; |
318 | 318 |
319 static void add_derived_oop(oop* base, oop* derived) { | 319 static void add_derived_oop(oop* base, oop* derived) { |
320 #ifndef TIERED | 320 #ifndef TIERED |
321 COMPILER1_PRESENT(ShouldNotReachHere();) | 321 COMPILER1_PRESENT(ShouldNotReachHere();) |
322 GRAALVM_ONLY(ShouldNotReachHere();) | 322 COMPILERGRAAL_PRESENT(ShouldNotReachHere();) |
323 #endif // TIERED | 323 #endif // TIERED |
324 #ifdef COMPILER2 | 324 #ifdef COMPILER2 |
325 DerivedPointerTable::add(derived, base); | 325 DerivedPointerTable::add(derived, base); |
326 #endif // COMPILER2 | 326 #endif // COMPILER2 |
327 } | 327 } |
379 { | 379 { |
380 OopMapStream oms(map,OopMapValue::derived_oop_value); | 380 OopMapStream oms(map,OopMapValue::derived_oop_value); |
381 if (!oms.is_done()) { | 381 if (!oms.is_done()) { |
382 #ifndef TIERED | 382 #ifndef TIERED |
383 COMPILER1_PRESENT(ShouldNotReachHere();) | 383 COMPILER1_PRESENT(ShouldNotReachHere();) |
384 GRAALVM_ONLY(ShouldNotReachHere();) | 384 COMPILERGRAAL_PRESENT(ShouldNotReachHere();) |
385 #endif // !TIERED | 385 #endif // !TIERED |
386 // Protect the operation on the derived pointers. This | 386 // Protect the operation on the derived pointers. This |
387 // protects the addition of derived pointers to the shared | 387 // protects the addition of derived pointers to the shared |
388 // derived pointer table in DerivedPointerTable::add(). | 388 // derived pointer table in DerivedPointerTable::add(). |
389 MutexLockerEx x(DerivedPointerTableGC_lock, Mutex::_no_safepoint_check_flag); | 389 MutexLockerEx x(DerivedPointerTableGC_lock, Mutex::_no_safepoint_check_flag); |
521 #ifndef PRODUCT | 521 #ifndef PRODUCT |
522 | 522 |
523 bool OopMap::has_derived_pointer() const { | 523 bool OopMap::has_derived_pointer() const { |
524 #ifndef TIERED | 524 #ifndef TIERED |
525 COMPILER1_PRESENT(return false); | 525 COMPILER1_PRESENT(return false); |
526 GRAALVM_ONLY(return false); | 526 COMPILERGRAAL_PRESENT(return false); |
527 #endif // !TIERED | 527 #endif // !TIERED |
528 #ifdef COMPILER2 | 528 #ifdef COMPILER2 |
529 OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value); | 529 OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value); |
530 return oms.is_done(); | 530 return oms.is_done(); |
531 #else | 531 #else |