dlang · wilzbach · Jul 5, 2018 · Jun 29, 2018 · Jun 27, 2018 · Jun 28, 2018
diff --git a/changelog/remove_std_c.dd b/changelog/remove_std_c.dd
diff --git a/changelog/std-algorithm-iteration-joiner.dd b/changelog/std-algorithm-iteration-joiner.dd
diff --git a/changelog/std-algorithm-mutation-remove.dd b/changelog/std-algorithm-mutation-remove.dd
diff --git a/changelog/std-math-fminmax.dd b/changelog/std-math-fminmax.dd
diff --git a/std/experimental/allocator/building_blocks/bitmapped_block.d b/std/experimental/allocator/building_blocks/bitmapped_block.d
@@ -99,7 +99,7 @@ private mixin template BitmappedBlockImpl(bool isShared, bool multiBlock)
         auto leadingUlongs = blocks.divideRoundUp(64);
         import std.algorithm.comparison : min;
         immutable initialAlignment = min(parentAlignment,
-            1U << trailingZeros(leadingUlongs * 8));
+            1U << min(31U, trailingZeros(leadingUlongs * 8)));
         auto maxSlack = alignment <= initialAlignment
             ? 0
             : alignment - initialAlignment;

@@ -287,16 +287,19 @@ Returns the effective alignment of `ptr`, i.e. the largest power of two that is
 a divisor of `ptr`.
 */
 @nogc nothrow pure
-package uint effectiveAlignment(void* ptr)
+package size_t effectiveAlignment(void* ptr)
 {
-    return 1U << trailingZeros(cast(size_t) ptr);
+    return (cast(size_t) 1) << trailingZeros(cast(size_t) ptr);
 }
 
 @nogc nothrow pure
 @system unittest
 {
     int x;
     assert(effectiveAlignment(&x) >= int.alignof);
+
+    const max = (cast(size_t) 1) << (size_t.sizeof * 8 - 1);
+    assert(effectiveAlignment(cast(void*) max) == max);
 }
 
 /*