---

yaml
---
r: 44421
b: refs/heads/master
c: c22d0af
h: refs/heads/master
i:
  44419: 7e110ab
v: v3

Author: luqmana

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d67e144f685783503c1406cb4f28ea19d91d1fec
+refs/heads/master: c22d0af14c621a847e71dac7fe0e7fe19bf851a1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/rt/rust_builtin.cpp

@@ -241,10 +241,13 @@ debug_opaque(type_desc *t, uint8_t *front) {
     rust_task *task = rust_get_current_task();
     LOG(task, stdlib, "debug_opaque");
     debug_tydesc_helper(t);
-    // FIXME (#2667) may want to actually account for alignment.
-    // `front` may not indeed be the front byte of the passed-in
-    // argument.
     for (uintptr_t i = 0; i < t->size; ++front, ++i) {
+
+        // Account for alignment. `front` may not indeed be the
+        // front byte of the passed-in argument
+        if (((uintptr_t)front % t->align) != 0)
+            front = (uint8_t *)align_to((uintptr_t)front, (size_t)t->align);
+
         LOG(task, stdlib, "  byte %" PRIdPTR ": 0x%" PRIx8, i, *front);
     }
 }