use shared ptr over optional in literalvalue

Author: clonker

libyul/AST.h

@@ -45,19 +45,21 @@ using TypedNameList = std::vector<TypedName>;
 enum class LiteralKind { Number, Boolean, String };
 struct LiteralValue {
 	using Data = u256;
-	using RepresentationHint = std::optional<std::string>;
+	using RepresentationHint = std::shared_ptr<std::string>;
 
-	LiteralValue& operator=(u256 const& _v) { data = _v; return *this; }
-	bool operator<(LiteralValue const& _rhs) const { return data < _rhs.data; }
+	LiteralValue() = default;
+	LiteralValue(Data const& _data, std::optional<std::string> const& _s = std::nullopt):
+		data(_data), representationHint(_s ? std::make_shared<std::string>(*_s) : nullptr) {}
+
+	LiteralValue& operator=(Data const& _v) { data = _v; return *this; }
 	bool operator==(LiteralValue const& _rhs) const { return data == _rhs.data; }
-	bool operator<(Data const& _rhs) const { return data < _rhs; }
 	bool operator==(Data const& _rhs) const { return data == _rhs; }
 	bool operator!=(Data const& _rhs) const { return data != _rhs; }
 
-	Data data;
-	RepresentationHint representationHint {std::nullopt};
+	Data data {0};
+	RepresentationHint representationHint {nullptr};
 };
-struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind{}; LiteralValue value; Type type; };
+struct Literal { langutil::DebugData::ConstPtr debugData; LiteralKind kind; LiteralValue value; Type type; };
 /// External / internal identifier or label reference
 struct Identifier { langutil::DebugData::ConstPtr debugData; YulString name; };
 /// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand

libyul/Utilities.cpp

@@ -136,7 +136,7 @@ bool Less<Literal>::operator()(Literal const& _lhs, Literal const& _rhs) const
 	if (std::make_tuple(_lhs.kind, _lhs.type) != std::make_tuple(_rhs.kind, _rhs.type))
 		return std::make_tuple(_lhs.kind, _lhs.type) < std::make_tuple(_rhs.kind, _rhs.type);
 
-	return _lhs.value < _rhs.value;
+	return _lhs.value.data < _rhs.value.data;
 }
 
 bool SwitchCaseCompareByLiteralValue::operator()(Case const* _lhs, Case const* _rhs) const