Merge branch 'gawk-4.1-stable' of ssh://git.sv.gnu.org/srv/git/gawk into gawk-4.1-stable

2 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e1cb3d1c..86cb8e7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* profile.c (pp_list): Unconditionally compute delimlen. Avoids
 	compiler warning.
 
+2016-03-02         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* debug.c (print_instruction): Improvements in instruction dump
+	for if and else.
+
 2016-02-29         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* profile.c (pp_list): Handle the case of nargs equal to zero.
diff --git a/debug.c b/debug.c
index 7699924c..a32b0156 100644
--- a/debug.c
+++ b/debug.c
@@ -3788,6 +3788,15 @@ print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump)
 
 			
 	switch (pc->opcode) {
+	case Op_K_if:
+		print_func(fp, "[branch_if = %p] [branch_else = %p] [branch_else->lasti = %p]\n",
+				pc->branch_if, pc->branch_else, pc->branch_else->lasti);
+		break;
+
+	case Op_K_else:
+		print_func(fp, "[branch_end = %p]\n", pc->branch_end);
+		break;
+
 	case Op_var_update:
 		print_func(fp, "[update_%s()]\n", get_spec_varname(pc->update_var));
 		break;