- // TODO, get rid of this?
- if (!member->has_offset_location())
- return ((char *) base) + member->offset();
-
- s_mc_expression_state_t state;
- memset(&state, 0, sizeof(s_mc_expression_state_t));
- state.frame_base = NULL;
- state.cursor = NULL;
+ ExpressionContext state;
+ state.frame_base = nullptr;
+ state.cursor = nullptr;