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

Avoid undefined behavior

2 files changed, 3 insertions, 3 deletions

diff --git a/src/codedump.c b/src/codedump.c
index 5acc274c3..e70df3205 100644
--- a/src/codedump.c
+++ b/src/codedump.c
@@ -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);
diff --git a/src/vm.c b/src/vm.c
index 14c6a0b69..c87fa9dc6 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -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;
     }