diff options
| -rw-r--r-- | llvm/include/llvm/Support/JSON.h | 6 | ||||
| -rw-r--r-- | llvm/unittests/Support/JSONTest.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/llvm/include/llvm/Support/JSON.h b/llvm/include/llvm/Support/JSON.h index 4b009438b71..cb08e4ac6e3 100644 --- a/llvm/include/llvm/Support/JSON.h +++ b/llvm/include/llvm/Support/JSON.h @@ -57,6 +57,7 @@ namespace json { class Array; class ObjectKey; class Value; +template <typename T> Value toJSON(const llvm::Optional<T> &Opt); /// An Object is a JSON object, which maps strings to heterogenous JSON values. /// It simulates DenseMap<ObjectKey, Value>. ObjectKey is a maybe-owned string. @@ -579,6 +580,11 @@ bool fromJSON(const Value &E, std::map<std::string, T> &Out) { return false; } +// Allow serialization of Optional<T> for supported T. +template <typename T> Value toJSON(const llvm::Optional<T> &Opt) { + return Opt ? Value(*Opt) : Value(nullptr); +} + /// Helper for mapping JSON objects onto protocol structs. /// /// Example: diff --git a/llvm/unittests/Support/JSONTest.cpp b/llvm/unittests/Support/JSONTest.cpp index 08307c10d2d..07580aa61f1 100644 --- a/llvm/unittests/Support/JSONTest.cpp +++ b/llvm/unittests/Support/JSONTest.cpp @@ -37,6 +37,8 @@ TEST(JSONTest, Constructors) { EXPECT_EQ(R"({"A":{"B":{}}})", s(Object{{"A", Object{{"B", Object{}}}}})); EXPECT_EQ(R"({"A":{"B":{"X":"Y"}}})", s(Object{{"A", Object{{"B", Object{{"X", "Y"}}}}}})); + EXPECT_EQ("null", s(llvm::Optional<double>())); + EXPECT_EQ("2.5", s(llvm::Optional<double>(2.5))); } TEST(JSONTest, StringOwnership) { |
