Some fixes taking other pull requests into account.

This commit is contained in:
chriseth
2015-10-15 18:14:14 +02:00
parent e21df35416
commit 1d4219d43d
3 changed files with 7 additions and 12 deletions
+2 -3
View File
@@ -664,9 +664,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
// stack: newLength storageSlot slotOffset
arguments[0]->accept(*this);
// stack: newLength storageSlot slotOffset argValue
TypePointer type = arguments[0]->annotation().type;
utils().convertType(*type, *arrayType->baseType());
type = arrayType->baseType();
TypePointer type = arguments[0]->annotation().type->closestTemporaryType(arrayType->baseType());
utils().convertType(*arguments[0]->annotation().type, *type);
utils().moveToStackTop(1 + type->sizeOnStack());
utils().moveToStackTop(1 + type->sizeOnStack());
// stack: newLength argValue storageSlot slotOffset