ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

make asserts in loadLocal and storeLocal more strict

Browse Source
This commit is contained in:
Joshua Warner 2014-05-03 22:01:28 -06:00 committed by Joshua Warner
parent 91c5599fc0
commit 9a54c50db6
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/compile.cpp
View File

@ -1272,13 +1272,7 @@ ir::Value* loadLocal(Context* context,
ir::Value* result = context->compiler->loadLocal(
type, translateLocalIndex(context, footprint, index));
assert(context->thread,
(type.flavor() != ir::Type::Object && type == result->type)
|| (type.flavor() == ir::Type::Object
&& (result->type.flavor() == ir::Type::Object
|| result->type.flavor() == ir::Type::Address))
// TODO Temporary hack for Subroutine test!!!
|| result->type.flavor() == ir::Type::Integer);
assert(context->thread, type == result->type);
return result;
}
@ -1288,13 +1282,7 @@ void storeLocal(Context* context,
ir::Value* value,
unsigned index)
{
assert(context->thread,
(type.flavor() != ir::Type::Object && type == value->type)
|| (type.flavor() == ir::Type::Object
&& (value->type.flavor() == ir::Type::Object
|| value->type.flavor() == ir::Type::Address))
// TODO Temporary hack for Subroutine test!!!
|| value->type.flavor() == ir::Type::Integer);
assert(context->thread, type == value->type);
context->compiler->storeLocal(value,
translateLocalIndex(context, footprint, index));
}
@ -2099,10 +2087,10 @@ class Frame {
void startSubroutine(unsigned ip, unsigned returnAddress)
{
// Push a dummy value to the stack, representing the return address (which
// we don't need, since we're expanding everything statically).
// TODO: in the future, push a value that we can track through type checking
pushAddress(); // push a dummy value to the stack, representing the return
// address (which we don't need, since we're expanding
// everything statically)
pushObject(c->constant(0, types.object));
if (DebugInstructions) {
fprintf(stderr, "startSubroutine %u %u\n", ip, returnAddress);