-static int next_value_number_function;
-static ir_node *continue_label;
-static ir_node *break_label;
-static ir_node *current_switch;
-static bool saw_default_label;
-static label_t **all_labels;
-static entity_t **inner_functions;
-static ir_node *ijmp_list;
-static bool constant_folding;
+static int next_value_number_function;
+static jump_target continue_target;
+static jump_target break_target;
+static ir_node *current_switch;
+static bool saw_default_label;
+static entity_t **inner_functions;
+static jump_target ijmp_target;
+static ir_node **ijmp_ops;
+static ir_node **ijmp_blocks;
+static bool constant_folding;
+
+#define PUSH_BREAK(val) \
+ jump_target const old_break_target = break_target; \
+ (init_jump_target(&break_target, (val)))
+#define POP_BREAK() \
+ ((void)(break_target = old_break_target))
+
+#define PUSH_CONTINUE(val) \
+ jump_target const old_continue_target = continue_target; \
+ (init_jump_target(&continue_target, (val)))
+#define POP_CONTINUE() \
+ ((void)(continue_target = old_continue_target))
+
+#define PUSH_IRG(val) \
+ ir_graph *const old_irg = current_ir_graph; \
+ ir_graph *const new_irg = (val); \
+ ((void)(current_ir_graph = new_irg))
+
+#define POP_IRG() \
+ (assert(current_ir_graph == new_irg), (void)(current_ir_graph = old_irg))