--- old/src/share/vm/gc/cms/compactibleFreeListSpace.cpp	2017-07-17 17:45:02.239252022 +0200
+++ new/src/share/vm/gc/cms/compactibleFreeListSpace.cpp	2017-07-17 17:45:02.091252304 +0200
@@ -1202,7 +1202,7 @@
 
   size_t i;
   size_t currSize = numWords + MinChunkSize;
-  assert(currSize % MinObjAlignment == 0, "currSize should be aligned");
+  assert((currSize & MinObjAlignmentMask) == 0, "currSize should be aligned");
   for (i = currSize; i < IndexSetSize; i += IndexSetStride) {
     AdaptiveFreeList<FreeChunk>* fl = &_indexedFreeList[i];
     if (fl->head()) {
@@ -1733,7 +1733,7 @@
     AdaptiveFreeList<FreeChunk>* it   = _indexedFreeList;
     size_t    hint = _indexedFreeList[start].hint();
     while (hint < IndexSetSize) {
-      assert(hint % MinObjAlignment == 0, "hint should be aligned");
+      assert((hint & MinObjAlignmentMask) == 0, "hint should be aligned");
       AdaptiveFreeList<FreeChunk> *fl = &_indexedFreeList[hint];
       if (fl->surplus() > 0 && fl->head() != NULL) {
         // Found a list with surplus, reset original hint