From 0ee3eec478ef94e6de431ef70b30142d4b1439c3 Mon Sep 17 00:00:00 2001
From: Joshua Warner <joshuawarner32@gmail.com>
Date: Thu, 1 May 2014 00:01:14 -0600
Subject: [PATCH] add extra type checks to Compiler::store

---
 src/codegen/compiler.cpp |  1 +
 src/compile.cpp          | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/codegen/compiler.cpp b/src/codegen/compiler.cpp
index 6c824efce8..39cfc1d51e 100644
--- a/src/codegen/compiler.cpp
+++ b/src/codegen/compiler.cpp
@@ -2619,6 +2619,7 @@ class MyCompiler: public Compiler {
     assert(&c,
            srcType.flavor() != ir::Type::Float
            || srcType.size() == static_cast<Value*>(src)->type.size());
+    assert(&c, dstType == static_cast<Value*>(dst)->type);
     appendMove(&c,
                lir::Move,
                srcType.size(),
diff --git a/src/compile.cpp b/src/compile.cpp
index 8165571427..be02803e96 100644
--- a/src/compile.cpp
+++ b/src/compile.cpp
@@ -3746,7 +3746,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
       Compiler::Operand* address = popLongAddress(frame);
       frame->popObject();
       frame->pushInt(
-          c->load(1, 1, c->memory(address, types.i4), TargetBytesPerWord));
+          c->load(1, 1, c->memory(address, types.i1), TargetBytesPerWord));
       return true;
     } else if (MATCH(methodName(t, target), "putByte")
                and MATCH(methodSpec(t, target), "(JB)V"))
@@ -3754,7 +3754,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
       Compiler::Operand* value = frame->popInt();
       Compiler::Operand* address = popLongAddress(frame);
       frame->popObject();
-      c->store(types.address, value, types.i1, c->memory(address, types.i4));
+      c->store(types.address, value, types.i1, c->memory(address, types.i1));
       return true;
     } else if ((MATCH(methodName(t, target), "getShort")
                 and MATCH(methodSpec(t, target), "(J)S"))
@@ -3764,7 +3764,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
       Compiler::Operand* address = popLongAddress(frame);
       frame->popObject();
       frame->pushInt(
-          c->load(2, 2, c->memory(address, types.i4), TargetBytesPerWord));
+          c->load(2, 2, c->memory(address, types.i2), TargetBytesPerWord));
       return true;
     } else if ((MATCH(methodName(t, target), "putShort")
                 and MATCH(methodSpec(t, target), "(JS)V"))
@@ -3774,7 +3774,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
       Compiler::Operand* value = frame->popInt();
       Compiler::Operand* address = popLongAddress(frame);
       frame->popObject();
-      c->store(types.address, value, types.i2, c->memory(address, types.i4));
+      c->store(types.address, value, types.i2, c->memory(address, types.i2));
       return true;
     } else if ((MATCH(methodName(t, target), "getInt")
                 and MATCH(methodSpec(t, target), "(J)I"))
@@ -3814,8 +3814,8 @@ intrinsic(MyThread* t, Frame* frame, object target)
           c->load(8,
                   8,
                   c->memory(address,
-                            MATCH(methodName(t, target), "getLong") ? types.i4
-                                                                    : types.f4),
+                            MATCH(methodName(t, target), "getLong") ? types.i8
+                                                                    : types.f8),
                   8));
       return true;
     } else if ((MATCH(methodName(t, target), "putLong")
@@ -5764,7 +5764,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
               types.address,
               value,
               types.i1,
-              c->memory(table, types.i4, targetFieldOffset(context, field)));
+              c->memory(table, types.i1, targetFieldOffset(context, field)));
           break;
 
         case CharField:
@@ -5773,7 +5773,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
               types.address,
               value,
               types.i2,
-              c->memory(table, types.i4, targetFieldOffset(context, field)));
+              c->memory(table, types.i2, targetFieldOffset(context, field)));
           break;
             
         case FloatField:
@@ -5797,7 +5797,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
               types.f8,
               value,
               types.f8,
-              c->memory(table, types.f4, targetFieldOffset(context, field)));
+              c->memory(table, types.f8, targetFieldOffset(context, field)));
           break;
 
         case LongField:
@@ -5805,7 +5805,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
               types.i8,
               value,
               types.i8,
-              c->memory(table, types.i4, targetFieldOffset(context, field)));
+              c->memory(table, types.i8, targetFieldOffset(context, field)));
           break;
 
         case ObjectField: