summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Fiddaman <omnios@citrus-it.co.uk>2020-11-19 21:33:40 +0000
committerAndy Fiddaman <omnios@citrus-it.co.uk>2020-11-20 22:03:19 +0000
commit986529380f11a23c3c6de33e5cea6611d4abe648 (patch)
treea445220c8945e78d651cb342803917731272312e
parent56e9aab1260c03d8b79e246590e46e9aa0ee0531 (diff)
downloadillumos-joyent-986529380f11a23c3c6de33e5cea6611d4abe648.tar.gz
13323 CTF forward test needs adjusting after 13278
Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Robert Mustacchi <rm@fingolfin.org> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
-rw-r--r--usr/src/test/util-tests/tests/ctf/check-forward.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/usr/src/test/util-tests/tests/ctf/check-forward.c b/usr/src/test/util-tests/tests/ctf/check-forward.c
index 7418b9922e..4504d7ee78 100644
--- a/usr/src/test/util-tests/tests/ctf/check-forward.c
+++ b/usr/src/test/util-tests/tests/ctf/check-forward.c
@@ -15,14 +15,6 @@
/*
* Verify that we can properly handle forward declarations.
- *
- * In test-forward.c barp is declared as a union, not a struct. However, today
- * the CTF tooling does not contain enough information to know whether a forward
- * declaration was for a struct or a union, only that it was a forward.
- * Therefore, the type printing information assumes at the moment that the type
- * is a struct. In a future revision of the CTF type data, we should encode this
- * information in the equivalent of ctt_info so we can properly distinguish
- * between these.
*/
#include "check-common.h"
@@ -30,7 +22,7 @@
static check_symbol_t check_syms[] = {
{ "forward", "struct forward" },
{ "foop", "struct foo *" },
- { "barp", "struct bar *" },
+ { "barp", "union bar *" },
{ "bazp", "enum baz *" },
{ NULL }
};
@@ -39,12 +31,12 @@ static check_member_t check_member_forward[] = {
#ifdef TARGET_LP64
{ "prev", "struct foo *", 0 },
{ "next", "struct foo *", 8 * NBBY },
- { "data", "struct bar *", 16 * NBBY },
+ { "data", "union bar *", 16 * NBBY },
{ "tag", "enum baz *", 24 * NBBY },
#else
{ "prev", "struct foo *", 0 },
{ "next", "struct foo *", 4 * NBBY },
- { "data", "struct bar *", 8 * NBBY },
+ { "data", "union bar *", 8 * NBBY },
{ "tag", "enum baz *", 12 * NBBY },
#endif
{ NULL }
@@ -67,8 +59,8 @@ static check_descent_t check_descent_foo[] = {
};
static check_descent_t check_descent_bar[] = {
- { "struct bar *", CTF_K_POINTER },
- { "struct bar", CTF_K_FORWARD },
+ { "union bar *", CTF_K_POINTER },
+ { "union bar", CTF_K_FORWARD },
{ NULL }
};