cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change pre-created types to unique_ptr to avoid copying and moving.

Browse Source
This commit is contained in:
chriseth 2019-04-16 18:11:43 +02:00
parent 58a45f2cb6
commit 4656d7ca7d
2 changed files with 135 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
libsolidity/ast/TypeProvider.cpp
View File

@ -34,158 +34,152 @@ TupleType const TypeProvider::m_emptyTupleType{};
AddressType const TypeProvider::m_payableAddressType{StateMutability::Payable}; AddressType const TypeProvider::m_payableAddressType{StateMutability::Payable};
AddressType const TypeProvider::m_addressType{StateMutability::NonPayable}; AddressType const TypeProvider::m_addressType{StateMutability::NonPayable};
array<IntegerType, 32> const TypeProvider::m_intM{ array<unique_ptr<IntegerType>, 32> const TypeProvider::m_intM{{
IntegerType{8 * 1, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Signed)},
IntegerType{8 * 2, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Signed)},
IntegerType{8 * 3, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Signed)},
IntegerType{8 * 4, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Signed)},
IntegerType{8 * 5, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Signed)},
IntegerType{8 * 6, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Signed)},
IntegerType{8 * 7, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Signed)},
IntegerType{8 * 8, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Signed)},
IntegerType{8 * 9, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Signed)},
IntegerType{8 * 10, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Signed)},
IntegerType{8 * 11, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Signed)},
IntegerType{8 * 12, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Signed)},
IntegerType{8 * 13, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Signed)},
IntegerType{8 * 14, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Signed)},
IntegerType{8 * 15, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Signed)},
IntegerType{8 * 16, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Signed)},
IntegerType{8 * 17, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Signed)},
IntegerType{8 * 18, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Signed)},
IntegerType{8 * 19, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Signed)},
IntegerType{8 * 20, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Signed)},
IntegerType{8 * 21, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Signed)},
IntegerType{8 * 22, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Signed)},
IntegerType{8 * 23, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Signed)},
IntegerType{8 * 24, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Signed)},
IntegerType{8 * 25, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Signed)},
IntegerType{8 * 26, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Signed)},
IntegerType{8 * 27, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Signed)},
IntegerType{8 * 28, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Signed)},
IntegerType{8 * 29, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Signed)},
IntegerType{8 * 30, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Signed)},
IntegerType{8 * 31, IntegerType::Modifier::Signed}, {make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Signed)},
IntegerType{8 * 32, IntegerType::Modifier::Signed} {make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Signed)}
}; }};
array<IntegerType, 32> const TypeProvider::m_uintM{ array<unique_ptr<IntegerType>, 32> const TypeProvider::m_uintM{{
IntegerType{8 * 1, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 2, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 3, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 4, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 5, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 6, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 7, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 8, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 9, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 10, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 11, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 12, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 13, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 14, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 15, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 16, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 17, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 18, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 19, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 20, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 21, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 22, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 23, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 24, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 25, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 26, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 27, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 28, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 29, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 30, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 31, IntegerType::Modifier::Unsigned}, {make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Unsigned)},
IntegerType{8 * 32, IntegerType::Modifier::Unsigned} {make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Unsigned)}
}; }};
array<FixedBytesType, 32> const TypeProvider::m_bytesM{ array<unique_ptr<FixedBytesType>, 32> const TypeProvider::m_bytesM{{
FixedBytesType{1}, {make_unique<FixedBytesType>(1)},
FixedBytesType{2}, {make_unique<FixedBytesType>(2)},
FixedBytesType{3}, {make_unique<FixedBytesType>(3)},
FixedBytesType{4}, {make_unique<FixedBytesType>(4)},
FixedBytesType{5}, {make_unique<FixedBytesType>(5)},
FixedBytesType{6}, {make_unique<FixedBytesType>(6)},
FixedBytesType{7}, {make_unique<FixedBytesType>(7)},
FixedBytesType{8}, {make_unique<FixedBytesType>(8)},
FixedBytesType{9}, {make_unique<FixedBytesType>(9)},
FixedBytesType{10}, {make_unique<FixedBytesType>(10)},
FixedBytesType{11}, {make_unique<FixedBytesType>(11)},
FixedBytesType{12}, {make_unique<FixedBytesType>(12)},
FixedBytesType{13}, {make_unique<FixedBytesType>(13)},
FixedBytesType{14}, {make_unique<FixedBytesType>(14)},
FixedBytesType{15}, {make_unique<FixedBytesType>(15)},
FixedBytesType{16}, {make_unique<FixedBytesType>(16)},
FixedBytesType{17}, {make_unique<FixedBytesType>(17)},
FixedBytesType{18}, {make_unique<FixedBytesType>(18)},
FixedBytesType{19}, {make_unique<FixedBytesType>(19)},
FixedBytesType{20}, {make_unique<FixedBytesType>(20)},
FixedBytesType{21}, {make_unique<FixedBytesType>(21)},
FixedBytesType{22}, {make_unique<FixedBytesType>(22)},
FixedBytesType{23}, {make_unique<FixedBytesType>(23)},
FixedBytesType{24}, {make_unique<FixedBytesType>(24)},
FixedBytesType{25}, {make_unique<FixedBytesType>(25)},
FixedBytesType{26}, {make_unique<FixedBytesType>(26)},
FixedBytesType{27}, {make_unique<FixedBytesType>(27)},
FixedBytesType{28}, {make_unique<FixedBytesType>(28)},
FixedBytesType{29}, {make_unique<FixedBytesType>(29)},
FixedBytesType{30}, {make_unique<FixedBytesType>(30)},
FixedBytesType{31}, {make_unique<FixedBytesType>(31)},
FixedBytesType{32} {make_unique<FixedBytesType>(32)}
}; }};
array<MagicType, 4> const TypeProvider::m_magicTypes{ array<unique_ptr<MagicType>, 4> const TypeProvider::m_magicTypes{{
MagicType{MagicType::Kind::Block}, {make_unique<MagicType>(MagicType::Kind::Block)},
MagicType{MagicType::Kind::Message}, {make_unique<MagicType>(MagicType::Kind::Message)},
MagicType{MagicType::Kind::Transaction}, {make_unique<MagicType>(MagicType::Kind::Transaction)},
MagicType{MagicType::Kind::ABI} {make_unique<MagicType>(MagicType::Kind::ABI)}
// MetaType is stored separately // MetaType is stored separately
}; }};
inline void clearCache(Type const& type) inline void clearCache(Type const& type)
{ {
type.clearCache(); type.clearCache();
} }
template <typename... Args> template <typename T>
inline void clearCache(Type const& type, Args&... moreTypes) inline void clearCache(unique_ptr<T> const& type)
{ {
clearCache(type); type->clearCache();
clearCache(moreTypes...);
} }
template <typename Container> template <typename Container>
inline void clearAllCaches(Container& container) inline void clearCaches(Container& container)
{ {
for_each(begin(container), end(container), [](Type const& t) { t.clearCache(); }); for (auto const& e: container)
} clearCache(e);
template <typename Container, typename... Args>
inline void clearAllCaches(Container& types, Args&... more)
{
clearAllCaches(types);
clearAllCaches(more...);
} }
void TypeProvider::reset() void TypeProvider::reset()
{ {
clearCache( clearCache(m_boolType);
m_boolType, clearCache(m_inaccessibleDynamicType);
m_inaccessibleDynamicType, clearCache(m_bytesStorageType);
m_bytesStorageType, clearCache(m_bytesMemoryType);
m_bytesMemoryType, clearCache(m_stringStorageType);
m_stringStorageType, clearCache(m_stringMemoryType);
m_stringMemoryType, clearCache(m_emptyTupleType);
m_emptyTupleType, clearCache(m_payableAddressType);
m_payableAddressType, clearCache(m_addressType);
m_addressType clearCaches(instance().m_intM);
); clearCaches(instance().m_uintM);
clearAllCaches(instance().m_intM, instance().m_uintM, instance().m_bytesM, instance().m_magicTypes); clearCaches(instance().m_bytesM);
clearCaches(instance().m_magicTypes);
instance().m_generalTypes.clear(); instance().m_generalTypes.clear();
instance().m_stringLiteralTypes.clear(); instance().m_stringLiteralTypes.clear();
@ -498,7 +492,7 @@ ModifierType const* TypeProvider::modifierType(ModifierDefinition const& _def)
MagicType const* TypeProvider::magicType(MagicType::Kind _kind) MagicType const* TypeProvider::magicType(MagicType::Kind _kind)
{ {
solAssert(_kind != MagicType::Kind::MetaType, "MetaType is handled separately"); solAssert(_kind != MagicType::Kind::MetaType, "MetaType is handled separately");
return &m_magicTypes.at(static_cast<size_t>(_kind)); return m_magicTypes.at(static_cast<size_t>(_kind)).get();
} }
MagicType const* TypeProvider::metaType(Type const* _type) MagicType const* TypeProvider::metaType(Type const* _type)

14
libsolidity/ast/TypeProvider.h
View File

@ -64,7 +64,7 @@ public:
static BoolType const* boolType() noexcept { return &m_boolType; } static BoolType const* boolType() noexcept { return &m_boolType; }
static FixedBytesType const* byteType() { return fixedBytesType(1); } static FixedBytesType const* byteType() { return fixedBytesType(1); }
static FixedBytesType const* fixedBytesType(unsigned m) { return &m_bytesM.at(m - 1); } static FixedBytesType const* fixedBytesType(unsigned m) { return m_bytesM.at(m - 1).get(); }
static ArrayType const* bytesType() noexcept { return &m_bytesStorageType; } static ArrayType const* bytesType() noexcept { return &m_bytesStorageType; }
static ArrayType const* bytesMemoryType() noexcept { return &m_bytesMemoryType; } static ArrayType const* bytesMemoryType() noexcept { return &m_bytesMemoryType; }
@ -87,9 +87,9 @@ public:
{ {
solAssert((_bits % 8) == 0, ""); solAssert((_bits % 8) == 0, "");
if (_modifier == IntegerType::Modifier::Unsigned) if (_modifier == IntegerType::Modifier::Unsigned)
return &m_uintM.at(_bits / 8 - 1); return m_uintM.at(_bits / 8 - 1).get();
else else
return &m_intM.at(_bits / 8 - 1); return m_intM.at(_bits / 8 - 1).get();
} }
static IntegerType const* uint(unsigned _bits) { return integerType(_bits, IntegerType::Modifier::Unsigned); } static IntegerType const* uint(unsigned _bits) { return integerType(_bits, IntegerType::Modifier::Unsigned); }
@ -206,10 +206,10 @@ private:
static TupleType const m_emptyTupleType; static TupleType const m_emptyTupleType;
static AddressType const m_payableAddressType; static AddressType const m_payableAddressType;
static AddressType const m_addressType; static AddressType const m_addressType;
static std::array<IntegerType, 32> const m_intM; static std::array<std::unique_ptr<IntegerType>, 32> const m_intM;
static std::array<IntegerType, 32> const m_uintM; static std::array<std::unique_ptr<IntegerType>, 32> const m_uintM;
static std::array<FixedBytesType, 32> const m_bytesM; static std::array<std::unique_ptr<FixedBytesType>, 32> const m_bytesM;
static std::array<MagicType, 4> const m_magicTypes; ///< MagicType's except MetaType static std::array<std::unique_ptr<MagicType>, 4> const m_magicTypes; ///< MagicType's except MetaType
std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_ufixedMxN{}; std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_ufixedMxN{};
std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_fixedMxN{}; std::map<std::pair<unsigned, unsigned>, std::unique_ptr<FixedPointType>> m_fixedMxN{};