--- old/src/hotspot/share/utilities/bitMap.cpp	2019-11-21 11:55:42.277495233 +0100
+++ new/src/hotspot/share/utilities/bitMap.cpp	2019-11-21 11:55:42.025490973 +0100
@@ -217,7 +217,7 @@
     bm_word_t  mr = inverted_bit_mask_for_range(beg, end);
     bm_word_t  nw = value ? (w | ~mr) : (w & mr);
     while (true) {
-      bm_word_t res = Atomic::cmpxchg(nw, pw, w);
+      bm_word_t res = Atomic::cmpxchg(pw, w, nw);
       if (res == w) break;
       w  = res;
       nw = value ? (w | ~mr) : (w & mr);
@@ -640,7 +640,7 @@
       table[i] = num_set_bits(i);
     }
 
-    if (!Atomic::replace_if_null(table, &_pop_count_table)) {
+    if (!Atomic::replace_if_null(&_pop_count_table, table)) {
       guarantee(_pop_count_table != NULL, "invariant");
       FREE_C_HEAP_ARRAY(idx_t, table);
     }