Choices and their members are associated via the P_CHOICE property. Currently, prop_get_symbol(sym_get_choice_prop()) is used to obtain the choice of the given choice member. Replace it with sym_get_choice_menu(), which retrieves the choice without relying on P_CHOICE.
Unified · Split
| @@ -1078,12 +1078,14 @@ static void sym_check_print_recursive(struct symbol *last_sym) · 1077 unmodified lines | |||
| 1078 | struct dep_stack *stack; | 1078 | struct dep_stack *stack; |
| 1079 | struct symbol *sym, *next_sym; | 1079 | struct symbol *sym, *next_sym; |
| 1080 | struct menu *menu = NULL; | 1080 | struct menu *menu = NULL; |
| 1081 | struct menu *choice; | ||
| 1081 | struct property *prop; | 1082 | struct property *prop; |
| 1082 | struct dep_stack cv_stack; | 1083 | struct dep_stack cv_stack; |
| 1083 | 1084 | ||
| 1084 | if (sym_is_choice_value(last_sym)) { | 1085 | choice = sym_get_choice_menu(last_sym); |
| 1086 | if (choice) { | ||
| 1085 | dep_stack_insert(&cv_stack, last_sym); | 1087 | dep_stack_insert(&cv_stack, last_sym); |
| 1086 | last_sym = prop_get_symbol(sym_get_choice_prop(last_sym)); | 1088 | last_sym = choice->sym; |
| 1087 | } | 1089 | } |
| 1088 | 1090 | ||
| 1089 | for (stack = check_top; stack != NULL; stack = stack->prev) | 1091 | for (stack = check_top; stack != NULL; stack = stack->prev) |