Update IR

IR commit: a2f8452b3d35a756cba38924f5c51a48a7207494

Author: dstogov

ext/opcache/jit/ir/ir.c

@@ -778,7 +778,7 @@ static ir_ref _ir_fold_cse(ir_ctx *ctx, uint32_t opt, ir_ref op1, ir_ref op2, ir
 #define IR_FOLD_KEY(x)  ((x) & 0x1fffff)
 
 /*
- * key = insn->op | (insn->op1->op << 7) | (insn->op1->op << 14)
+ * key = insn->op | (insn->op1->op << 7) | (insn->op2->op << 14)
  *
  * ANY and UNUSED ops are represented by 0
  */

ext/opcache/jit/ir/ir_strtab.c

@@ -29,6 +29,7 @@ static uint32_t ir_str_hash(const char *str, size_t len)
 
 static uint32_t ir_strtab_hash_size(uint32_t size)
 {
+	/* Use big enough power of 2 */
 	size -= 1;
 	size |= (size >> 1);
 	size |= (size >> 2);
@@ -48,7 +49,7 @@ static void ir_strtab_resize(ir_strtab *strtab)
 	ir_strtab_bucket *p;
 	uint32_t pos, i;
 
-	memset(data, -1, hash_size * sizeof(uint32_t));
+	memset(data, IR_INVALID_IDX, hash_size * sizeof(uint32_t));
 	strtab->data = data + (hash_size * sizeof(uint32_t));
 	strtab->mask = (uint32_t)(-(int32_t)hash_size);
 	strtab->size = size;
@@ -94,7 +95,7 @@ void ir_strtab_init(ir_strtab *strtab, uint32_t size, uint32_t buf_size)
 	IR_ASSERT(size > 0);
 	uint32_t hash_size = ir_strtab_hash_size(size);
 	char *data = ir_mem_malloc(hash_size * sizeof(uint32_t) + size * sizeof(ir_strtab_bucket));
-	memset(data, -1, hash_size * sizeof(uint32_t));
+	memset(data, IR_INVALID_IDX, hash_size * sizeof(uint32_t));
 	strtab->data = (data + (hash_size * sizeof(uint32_t)));
 	strtab->mask = (uint32_t)(-(int32_t)hash_size);
 	strtab->size = size;

ext/opcache/jit/ir/ir_x86.dasc

@@ -3328,7 +3328,7 @@ static void ir_emit_mul_div_mod(ir_ctx *ctx, ir_ref def, ir_insn *insn)
 
 				|	mov byte [Ra(fp)+offset], ah
 			}
-		} else if (def_reg != IR_REG_RDX) {
+		} else {
 			if (def_reg != IR_REG_NONE) {
 				if (def_reg != IR_REG_RDX) {
 					ir_emit_mov(ctx, type, def_reg, IR_REG_RDX);