Merge pull request #6445 from lioncash/assert-guard Assert: Wrap assertion macro bodies in do {} while (0)