Merge pull request #5139 from shuujii/avoid-undefined-behavior

Avoid undefined behavior
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-11-16 22:49:03 +09:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -170,7 +170,7 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
print_lv_a(mrb, irep, a);
break;
CASE(OP_LOADI32, BSS);
printf("OP_LOADI32\tR%d\t%d\t", a, (int)(b<<16)+c);
printf("OP_LOADI32\tR%d\t%d\t", a, (int)(((uint32_t)b<<16)+c));
print_lv_a(mrb, irep, a);
break;
CASE(OP_LOADI__1, B);
+2 -2
View File
@@ -1069,7 +1069,7 @@ RETRY_TRY_BLOCK:
NEXT;
}
CASE(OP_LOADL16, BS) {
goto op_loadl;
}
@@ -1135,7 +1135,7 @@ RETRY_TRY_BLOCK:
}
CASE(OP_LOADI32, BSS) {
SET_INT_VALUE(mrb, regs[a], ((mrb_int)b<<16)+c);
SET_INT_VALUE(mrb, regs[a], (mrb_int)(((uint32_t)b<<16)+c));
NEXT;
}