From 10e01db4fb21f65e6b3b7d61fdb81b005b8c1983 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Mon, 10 Jun 2013 14:50:22 +0200
Subject: [PATCH] Debugger: Make autotest pass for LLDB arrays

Change-Id: I1baa4684e85d0ccd677956eeff88b4cc7d807922
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 share/qtcreator/dumper/lbridge.py | 22 +++++++++++++++-------
 share/qtcreator/dumper/qttypes.py |  5 ++---
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/share/qtcreator/dumper/lbridge.py b/share/qtcreator/dumper/lbridge.py
index 5aaf1203378..ad7ee38ee4f 100644
--- a/share/qtcreator/dumper/lbridge.py
+++ b/share/qtcreator/dumper/lbridge.py
@@ -293,13 +293,16 @@ def impl_SBValue__int__(self):
 def impl_SBValue__long__(self):
     return int(self.GetValue(), 0)
 
-def impl_SBValue__getitem__(self, name):
-    if self.GetType().IsPointerType() and isinstance(name, int):
-        innertype = self.Dereference().GetType()
-        address = self.GetValueAsUnsigned() + name * innertype.GetByteSize()
-        address = address & 0xFFFFFFFFFFFFFFFF  # Force unsigned
-        return self.CreateValueFromAddress(None, address, innertype)
-    return self.GetChildMemberWithName(name)
+def impl_SBValue__getitem__(value, index):
+    if isinstance(index, int):
+        type = value.GetType()
+        if type.IsPointerType():
+            innertype = value.Dereference().GetType()
+            address = value.GetValueAsUnsigned() + index * innertype.GetByteSize()
+            address = address & 0xFFFFFFFFFFFFFFFF  # Force unsigned
+            return value.CreateValueFromAddress(None, address, innertype)
+        return value.GetChildAtIndex(index)
+    return value.GetChildMemberWithName(index)
 
 def childAt(value, index):
     return value.GetChildAtIndex(index)
@@ -947,6 +950,11 @@ class Dumper:
         # Our turf now.
         value.SetPreferSyntheticValue(False)
 
+        # Arrays
+        if value.GetType().GetTypeClass() == lldb.eTypeClassArray:
+            qdump____c_style_array__(self, value)
+            return
+
         # References
         if value.GetType().IsReferenceType():
             type = value.GetType().GetDereferencedType().GetPointerType()
diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py
index fb7e54b0d92..6661ec9705a 100644
--- a/share/qtcreator/dumper/qttypes.py
+++ b/share/qtcreator/dumper/qttypes.py
@@ -1981,10 +1981,9 @@ def qdump__QxXmlAttributes(d, value):
 
 def qdump____c_style_array__(d, value):
     type = value.type.unqualified()
-    targetType = type.target()
-    typeName = str(type)
+    targetType = value[0].type
     #d.putAddress(value.address)
-    d.putType(typeName)
+    d.putType(type)
     d.putNumChild(1)
     format = d.currentItemFormat()
     isDefault = format == None and str(targetType.unqualified()) == "char"