1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Sep 26 10:25:02 2013 -0400
1.3 @@ -9065,7 +9065,7 @@
1.4 return !stack->isEmpty();
1.5 }
1.6
1.7 -#define BUSY (oop(0x1aff1aff))
1.8 +#define BUSY (cast_to_oop<intptr_t>(0x1aff1aff))
1.9 // (MT-safe) Get a prefix of at most "num" from the list.
1.10 // The overflow list is chained through the mark word of
1.11 // each object in the list. We fetch the entire list,
1.12 @@ -9098,7 +9098,7 @@
1.13 return false;
1.14 }
1.15 // Grab the entire list; we'll put back a suffix
1.16 - oop prefix = (oop)Atomic::xchg_ptr(BUSY, &_overflow_list);
1.17 + oop prefix = cast_to_oop(Atomic::xchg_ptr(BUSY, &_overflow_list));
1.18 Thread* tid = Thread::current();
1.19 // Before "no_of_gc_threads" was introduced CMSOverflowSpinCount was
1.20 // set to ParallelGCThreads.
1.21 @@ -9113,7 +9113,7 @@
1.22 return false;
1.23 } else if (_overflow_list != BUSY) {
1.24 // Try and grab the prefix
1.25 - prefix = (oop)Atomic::xchg_ptr(BUSY, &_overflow_list);
1.26 + prefix = cast_to_oop(Atomic::xchg_ptr(BUSY, &_overflow_list));
1.27 }
1.28 }
1.29 // If the list was found to be empty, or we spun long
