tetsuo-cpp created this revision.
tetsuo-cpp added a reviewer: xbolva00.
tetsuo-cpp added projects: LLVM, LLDB.
Herald added subscribers: lldb-commits, JDevlieghere.
Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=39405
alexc@kitty:~/work/wiredtiger/build_posix$ cat breakpoint.json
[{"Breakpoint" : {"BKPTOptions" : {"AutoContinue" : false,"ConditionText" :
"","EnabledState" : true,"IgnoreCount" : 0,"OneShotState" :
false},"BKPTResolver" : {"Options" : {"NameMask" : [56],"Offset" :
0,"SkipPrologue" : true,"SymbolNames" : ["__wt_btcur_search"]},"Type" :
"SymbolName"},"Hardware" : false,"SearchFilter" : {"Options" : {},"Type" :
"Unconstrained","Foo" : []}}}]
**Before**
(lldb) breakpoint read --file breakpoint.json
error: Invalid JSON from input file:
/home/alexc/work/wiredtiger/build_posix/breakpoint.json.
**After**
(lldb) breakpoint read --file breakpoint.json
New breakpoints:
Breakpoint 1: where = libwiredtiger-3.2.2.so`__wt_btcur_search + 15 at
bt_cursor.c:522:5, address = 0x00007ffff576ab2f
Repository:
rLLDB LLDB
https://reviews.llvm.org/D68179
Files:
lldb/include/lldb/Utility/JSON.h
lldb/source/Utility/JSON.cpp
lldb/source/Utility/StructuredData.cpp
lldb/tools/debugserver/source/JSON.cpp
lldb/tools/debugserver/source/JSON.h
Index: lldb/tools/debugserver/source/JSON.h
===================================================================
--- lldb/tools/debugserver/source/JSON.h
+++ lldb/tools/debugserver/source/JSON.h
@@ -292,6 +292,8 @@
JSONValue::SP ParseJSONValue();
protected:
+ JSONValue::SP ParseJSONValue(const std::string &value, const Token &token);
+
JSONValue::SP ParseJSONObject();
JSONValue::SP ParseJSONArray();
Index: lldb/tools/debugserver/source/JSON.cpp
===================================================================
--- lldb/tools/debugserver/source/JSON.cpp
+++ lldb/tools/debugserver/source/JSON.cpp
@@ -516,13 +516,16 @@
std::string value;
std::string key;
while (true) {
- JSONValue::SP value_sp = ParseJSONValue();
+ JSONParser::Token token = GetToken(value);
+ if (token == JSONParser::Token::ArrayEnd)
+ return JSONValue::SP(array_up.release());
+ JSONValue::SP value_sp = ParseJSONValue(value, token);
if (value_sp)
array_up->AppendObject(value_sp);
else
break;
- JSONParser::Token token = GetToken(value);
+ token = GetToken(value);
if (token == JSONParser::Token::Comma) {
continue;
} else if (token == JSONParser::Token::ArrayEnd) {
@@ -537,6 +540,13 @@
JSONValue::SP JSONParser::ParseJSONValue() {
std::string value;
const JSONParser::Token token = GetToken(value);
+ return ParseJSONValue(value, token);
+}
+
+JSONValue::SP JSONParser::ParseJSONValue(const std::string &value,
+ const Token &token) {
+ std::string value;
+ const JSONParser::Token token = GetToken(value);
switch (token) {
case JSONParser::Token::ObjectStart:
return ParseJSONObject();
Index: lldb/source/Utility/StructuredData.cpp
===================================================================
--- lldb/source/Utility/StructuredData.cpp
+++ lldb/source/Utility/StructuredData.cpp
@@ -24,6 +24,9 @@
// Functions that use a JSONParser to parse JSON into StructuredData
static StructuredData::ObjectSP ParseJSONValue(JSONParser &json_parser);
+static StructuredData::ObjectSP ParseJSONValue(JSONParser &json_parser,
+ const std::string &value,
+ const JSONParser::Token &token);
static StructuredData::ObjectSP ParseJSONObject(JSONParser &json_parser);
static StructuredData::ObjectSP ParseJSONArray(JSONParser &json_parser);
@@ -83,13 +86,17 @@
std::string value;
std::string key;
while (true) {
- StructuredData::ObjectSP value_sp = ParseJSONValue(json_parser);
+ JSONParser::Token token = json_parser.GetToken(value);
+ if (token == JSONParser::Token::ArrayEnd)
+ return StructuredData::ObjectSP(array_up.release());
+ StructuredData::ObjectSP value_sp =
+ ParseJSONValue(json_parser, value, token);
if (value_sp)
array_up->AddItem(value_sp);
else
break;
- JSONParser::Token token = json_parser.GetToken(value);
+ token = json_parser.GetToken(value);
if (token == JSONParser::Token::Comma) {
continue;
} else if (token == JSONParser::Token::ArrayEnd) {
@@ -104,6 +111,12 @@
static StructuredData::ObjectSP ParseJSONValue(JSONParser &json_parser) {
std::string value;
const JSONParser::Token token = json_parser.GetToken(value);
+ return ParseJSONValue(json_parser, value, token);
+}
+
+static StructuredData::ObjectSP ParseJSONValue(JSONParser &json_parser,
+ const std::string &value,
+ const JSONParser::Token &token) {
switch (token) {
case JSONParser::Token::ObjectStart:
return ParseJSONObject(json_parser);
Index: lldb/source/Utility/JSON.cpp
===================================================================
--- lldb/source/Utility/JSON.cpp
+++ lldb/source/Utility/JSON.cpp
@@ -485,13 +485,16 @@
std::string value;
std::string key;
while (true) {
- JSONValue::SP value_sp = ParseJSONValue();
+ JSONParser::Token token = GetToken(value);
+ if (token == JSONParser::Token::ArrayEnd)
+ return JSONValue::SP(array_up.release());
+ JSONValue::SP value_sp = ParseJSONValue(value, token);
if (value_sp)
array_up->AppendObject(value_sp);
else
break;
- JSONParser::Token token = GetToken(value);
+ token = GetToken(value);
if (token == JSONParser::Token::Comma) {
continue;
} else if (token == JSONParser::Token::ArrayEnd) {
@@ -506,6 +509,11 @@
JSONValue::SP JSONParser::ParseJSONValue() {
std::string value;
const JSONParser::Token token = GetToken(value);
+ return ParseJSONValue(value, token);
+}
+
+JSONValue::SP JSONParser::ParseJSONValue(const std::string &value,
+ const Token &token) {
switch (token) {
case JSONParser::Token::ObjectStart:
return ParseJSONObject();
Index: lldb/include/lldb/Utility/JSON.h
===================================================================
--- lldb/include/lldb/Utility/JSON.h
+++ lldb/include/lldb/Utility/JSON.h
@@ -274,6 +274,8 @@
JSONValue::SP ParseJSONValue();
protected:
+ JSONValue::SP ParseJSONValue(const std::string &value, const Token &token);
+
JSONValue::SP ParseJSONObject();
JSONValue::SP ParseJSONArray();
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
