---

yaml
---
r: 47613
b: refs/heads/incoming
c: c22d0af
h: refs/heads/master
i:
  47611: 6c0425f
v: v3

Author: luqmana

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: d67e144f685783503c1406cb4f28ea19d91d1fec
+refs/heads/incoming: c22d0af14c621a847e71dac7fe0e7fe19bf851a1
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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);
     }
 }