From c5ac8fc21b320f5e090f71d75f24a40e9acbb043 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Thu, 16 Apr 2015 17:06:57 +0200
Subject: [PATCH] Debugger: Use simpler construction of basic types in LLDB
dumper
Cheaper, more robust.
Change-Id: I989853dc288864f4088f09f60c8c5b717e4faef0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
share/qtcreator/debugger/lldbbridge.py | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index 40f5dc938ee..0c5822ab5c9 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -479,33 +479,23 @@ class Dumper(DumperBase):
def intSize(self):
return 4
+ def ptrSize(self):
+ return self.target.GetAddressByteSize()
+
def intType(self):
- if self.intType_ is None:
- self.intType_ = self.target.FindFirstType('int')
- return self.intType_
+ return self.target.GetBasicType(lldb.eBasicTypeInt)
def int64Type(self):
- if self.int64Type_ is None:
- self.int64Type_ = self.target.FindFirstType('long long int')
- return self.int64Type_
+ return self.target.GetBasicType(lldb.eBasicTypeLongLong)
def charType(self):
- if self.charType_ is None:
- self.charType_ = self.target.FindFirstType('char')
- return self.charType_
+ return self.target.GetBasicType(lldb.eBasicTypeChar)
def charPtrType(self):
- if self.charPtrType_ is None:
- self.charPtrType_ = self.charType().GetPointerType()
- return self.charPtrType_
+ return self.target.GetBasicType(lldb.eBasicTypeChar).GetPointerType()
def voidPtrType(self):
- if self.voidPtrType_ is None:
- self.voidPtrType_ = self.target.FindFirstType('void').GetPointerType()
- return self.voidPtrType_
-
- def ptrSize(self):
- return self.charPtrType().GetByteSize()
+ return self.target.GetBasicType(lldb.eBasicVoid).GetPointerType()
def sizetType(self):
if self.sizetType_ is None:
--
GitLab