summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/StructuredData.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2015-06-25 21:46:34 +0000
committerGreg Clayton <gclayton@apple.com>2015-06-25 21:46:34 +0000
commit358cf1ea302ebc9c2f307aa710c22821a4ab670a (patch)
tree6107730cfdba431365534feddc2af4c36d12facc /lldb/source/Core/StructuredData.cpp
parentaed187c76e884dcb96e55312c16e1335580a2ed9 (diff)
downloadbcm5719-llvm-358cf1ea302ebc9c2f307aa710c22821a4ab670a.tar.gz
bcm5719-llvm-358cf1ea302ebc9c2f307aa710c22821a4ab670a.zip
Resubmitting 240466 after fixing the linux test suite failures.
A few extras were fixed - Symbol::GetAddress() now returns an Address object, not a reference. There were places where people were accessing the address of a symbol when the symbol's value wasn't an address symbol. On MacOSX, undefined symbols have a value zero and some places where using the symbol's address and getting an absolute address of zero (since an Address object with no section and an m_offset whose value isn't LLDB_INVALID_ADDRESS is considered an absolute address). So fixing this required some changes to make sure people were getting what they expected. - Since some places want to access the address as a reference, I added a few new functions to symbol: Address &Symbol::GetAddressRef(); const Address &Symbol::GetAddressRef() const; Linux test suite passes just fine now. <rdar://problem/21494354> llvm-svn: 240702
Diffstat (limited to 'lldb/source/Core/StructuredData.cpp')
-rw-r--r--lldb/source/Core/StructuredData.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/lldb/source/Core/StructuredData.cpp b/lldb/source/Core/StructuredData.cpp
index 9286c3a2991..a2c440948af 100644
--- a/lldb/source/Core/StructuredData.cpp
+++ b/lldb/source/Core/StructuredData.cpp
@@ -298,6 +298,10 @@ StructuredData::ParseJSON (std::string json_text)
{
object_sp = read_json_object (&c);
}
+ else if (*c == '[')
+ {
+ object_sp = read_json_array (&c);
+ }
else
{
// We have bad characters here, this is likely an illegal JSON string.
OpenPOWER on IntegriCloud