Commit: patch 9.0.1870: Vim9: disassamble does not show static

2 views
Skip to first unread message

Christian Brabandt

unread,
Sep 5, 2023, 1:45:13 AM9/5/23
to vim...@googlegroups.com
patch 9.0.1870: Vim9: disassamble does not show static

Commit: https://github.com/vim/vim/commit/00df69e62b2233d758f8c988794d66d53e887260
Author: Ernie Rael <err...@raelity.com>
Date: Tue Sep 5 07:38:09 2023 +0200

patch 9.0.1870: Vim9: disassamble does not show static

Problem: Vim9: disassamble does not show static
Solution: Show static flag

Fix disassemble for instructions with optional static:
ISN_GET_OBJ_MEMBER and ISN_GET_ITF_MEMBER

closes: #13030

Signed-off-by: Christian Brabandt <c...@256bit.org>
Co-authored-by: Ernie Rael <err...@raelity.com>

diff --git a/src/version.c b/src/version.c
index 0010dd5cf..7fb265362 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1870,
/**/
1869,
/**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index c98370eef..4a1dd1ce2 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -7156,12 +7156,17 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
case ISN_MEMBER: smsg("%s%4d MEMBER", pfx, current); break;
case ISN_STRINGMEMBER: smsg("%s%4d MEMBER %s", pfx, current,
iptr->isn_arg.string); break;
- case ISN_GET_OBJ_MEMBER: smsg("%s%4d OBJ_MEMBER %d", pfx, current,
- (int)iptr->isn_arg.number); break;
- case ISN_GET_ITF_MEMBER: smsg("%s%4d ITF_MEMBER %d on %s",
+ case ISN_GET_OBJ_MEMBER: smsg("%s%4d OBJ_MEMBER %d%s", pfx, current,
+ (int)iptr->isn_arg.classmember.cm_idx,
+ iptr->isn_arg.classmember.cm_static
+ ? " [STATIC]" : "");
+ break;
+ case ISN_GET_ITF_MEMBER: smsg("%s%4d ITF_MEMBER %d on %s%s",
pfx, current,
(int)iptr->isn_arg.classmember.cm_idx,
- iptr->isn_arg.classmember.cm_class->class_name);
+ iptr->isn_arg.classmember.cm_class->class_name,
+ iptr->isn_arg.classmember.cm_static
+ ? " [STATIC]" : "");
break;
case ISN_STORE_THIS: smsg("%s%4d STORE_THIS %d", pfx, current,
(int)iptr->isn_arg.number); break;
Reply all
Reply to author
Forward
0 new messages