From 58cd326d85f6eb67d46ecc41c111df086e836837 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Sun, 8 Dec 2013 19:01:44 -0500 Subject: [PATCH] Only optimize (a - (-b)) into (a + b) when the unary operand is a negation. This fixes (a - (!b)) being turned into (a + b). --- ast.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ast.c b/ast.c index 238d00a..e10bbed 100644 --- a/ast.c +++ b/ast.c @@ -442,17 +442,20 @@ ast_binary* ast_binary_new(lex_ctx_t ctx, int op, ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_binary_codegen); if (ast_istype(right, ast_unary) && OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) { - ast_expression *normal = ((ast_unary*)right)->operand; + ast_unary *unary = ((ast_unary*)right); + ast_expression *normal = unary->operand; /* make a-(-b) => a + b */ - if (op == INSTR_SUB_F) { - op = INSTR_ADD_F; - right = normal; - ++opts_optimizationcount[OPTIM_PEEPHOLE]; - } else if (op == INSTR_SUB_V) { - op = INSTR_ADD_V; - right = normal; - ++opts_optimizationcount[OPTIM_PEEPHOLE]; + if (unary->op == VINSTR_NEG_F || unary->op == VINSTR_NEG_V) { + if (op == INSTR_SUB_F) { + op = INSTR_ADD_F; + right = normal; + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + } else if (op == INSTR_SUB_V) { + op = INSTR_ADD_V; + right = normal; + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + } } } -- 2.39.2