diff options
| author | chriseth <chris@ethereum.org> | 2016-12-08 23:15:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 23:15:35 +0800 |
| commit | 84443eb56022cdb236425b99e253d0b142261372 (patch) | |
| tree | 4521cefe6c045373644c20b485c0b31c2ee9edd5 /libsolidity | |
| parent | e7ff4ac810a44cf3bfd58ee4ff198f136f011e2d (diff) | |
| parent | e7760417e83cf9e313c76cdd44f860aeec1b798c (diff) | |
| download | dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.tar dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.tar.gz dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.tar.bz2 dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.tar.lz dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.tar.xz dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.tar.zst dexon-solidity-84443eb56022cdb236425b99e253d0b142261372.zip | |
Merge pull request #1351 from ethereum/truncate_bit
Truncate a boolean from calldata into one bit
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 5 | ||||
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.h | 2 | ||||
| -rw-r--r-- | libsolidity/codegen/LValue.cpp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index a8299626..7c159ff7 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -926,6 +926,8 @@ unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCallda if (leftAligned) m_context << shiftFactor << Instruction::MUL; } + if (_fromCalldata) + convertType(_type, _type, true); return numBytes; } @@ -940,7 +942,7 @@ void CompilerUtils::cleanHigherOrderBits(IntegerType const& _typeOnStack) m_context << ((u256(1) << _typeOnStack.numBits()) - 1) << Instruction::AND; } -unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWordBoundaries) const +unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWordBoundaries) { unsigned numBytes = _type.calldataEncodedSize(_padToWordBoundaries); bool leftAligned = _type.category() == Type::Category::FixedBytes; @@ -949,6 +951,7 @@ unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWordBou else { solAssert(numBytes <= 32, "Memory store of more than 32 bytes requested."); + convertType(_type, _type, true); if (numBytes != 32 && !leftAligned && !_padToWordBoundaries) // shift the value accordingly before storing m_context << (u256(1) << ((32 - numBytes) * 8)) << Instruction::MUL; diff --git a/libsolidity/codegen/CompilerUtils.h b/libsolidity/codegen/CompilerUtils.h index 4baf48ff..0a5d8e1c 100644 --- a/libsolidity/codegen/CompilerUtils.h +++ b/libsolidity/codegen/CompilerUtils.h @@ -185,7 +185,7 @@ private: void cleanHigherOrderBits(IntegerType const& _typeOnStack); /// Prepares the given type for storing in memory by shifting it if necessary. - unsigned prepareMemoryStore(Type const& _type, bool _padToWordBoundaries) const; + unsigned prepareMemoryStore(Type const& _type, bool _padToWordBoundaries); /// Loads type from memory assuming memory offset is on stack top. unsigned loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWordBoundaries); diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp index 23fe2d4e..b9e141d8 100644 --- a/libsolidity/codegen/LValue.cpp +++ b/libsolidity/codegen/LValue.cpp @@ -223,7 +223,6 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc { solAssert(m_dataType->storageBytes() <= 32, "Invalid storage bytes size."); solAssert(m_dataType->storageBytes() > 0, "Invalid storage bytes size."); - if (m_dataType->storageBytes() == 32) { solAssert(m_dataType->sizeOnStack() == 1, "Invalid stack size."); |