Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Wed Jun 14 15:07:28 2017 +0800
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	Tue Jun 20 14:59:09 2017 +0800
     1.3 @@ -83,6 +83,10 @@
     1.4    // at any time. Do not use oop methods for accessing the mark!
     1.5    markOop test_mark = o->mark();
     1.6  
     1.7 +#ifdef MIPS64
     1.8 +  if (Use3A2000) OrderAccess::fence();
     1.9 +#endif
    1.10 +
    1.11    // The same test as "o->is_forwarded()"
    1.12    if (!test_mark->is_marked()) {
    1.13      bool new_obj_is_tenured = false;
    1.14 @@ -168,9 +172,6 @@
    1.15          if (new_obj == NULL) {
    1.16            _old_gen_is_full = true;
    1.17            return oop_promotion_failed(o, test_mark);
    1.18 -#ifdef MIPS64
    1.19 -        if (Use3A2000) OrderAccess::fence();
    1.20 -#endif
    1.21          }
    1.22        }
    1.23      }