From 43dc06bac1fc59faee71f84287550b1f8843cf47 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Tue, 15 Apr 2014 19:56:23 +0200 Subject: [PATCH] Fix FOLD of string concatenations. --- src/lj_opt_fold.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index 7194e618..ab963ed4 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c @@ -585,7 +585,8 @@ LJFOLDF(bufstr_kfold_cse) if (fleft->o == IR_BUFHDR) { /* No put operations? */ if (!(fleft->op2 & IRBUFHDR_APPEND)) /* Empty buffer? */ return lj_ir_kstr(J, &J2G(J)->strempty); - fins->op1 = fleft->prev; /* Relies on checks in bufput_append. */ + fins->op1 = fleft->op1; + fins->op2 = fleft->prev; /* Relies on checks in bufput_append. */ return CSEFOLD; } else if (fleft->o == IR_BUFPUT) { IRIns *irb = IR(fleft->op1);