azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[debugging][binding][python] drop fetching data in update method

Browse Source
This commit is contained in:
Vasily Levchenko
2018-10-01 17:25:08 +03:00
parent 2f9fdfd1d1
commit d1ccd1e631
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
llvmDebugInfoC/src/scripts/konan_lldb.py
+7 -18
View File
@@ -91,7 +91,7 @@ class KonanHelperProvider(lldb.SBSyntheticValueProvider):
self._ptr = lldb_val_to_ptr(self._valobj) self._ptr = lldb_val_to_ptr(self._valobj)
if is_string(valobj): if is_string(valobj):
return return
self._children_count = 0 self._children_count = int(evaluate("(int)Konan_DebugGetFieldCount({})".format(self._ptr)).GetValue())
self._children = [] self._children = []
self._children_types = [] self._children_types = []
self._children_type_names = [] self._children_type_names = []
@@ -106,6 +106,7 @@ class KonanHelperProvider(lldb.SBSyntheticValueProvider):
lambda address, name: self._valobj.CreateValueFromExpression(name, "(float *){:#x}".format(address)), lambda address, name: self._valobj.CreateValueFromExpression(name, "(float *){:#x}".format(address)),
lambda address, name: self._valobj.CreateValueFromExpression(name, "(double *){:#x}".format(address)), lambda address, name: self._valobj.CreateValueFromExpression(name, "(double *){:#x}".format(address)),
lambda address, name: self._valobj.CreateValueFromExpression(name, "(void **){:#x}".format(address)), lambda address, name: self._valobj.CreateValueFromExpression(name, "(void **){:#x}".format(address)),
lambda address, name: self._valobj.CreateValueFromExpression(name, "(bool *){:#x}".format(address)),
lambda address, name: None] lambda address, name: None]
self._types = [ self._types = [
@@ -120,10 +121,6 @@ class KonanHelperProvider(lldb.SBSyntheticValueProvider):
valobj.GetType().GetBasicType(lldb.eBasicTypeVoid).GetPointerType(), valobj.GetType().GetBasicType(lldb.eBasicTypeVoid).GetPointerType(),
valobj.GetType().GetBasicType(lldb.eBasicTypeBool) valobj.GetType().GetBasicType(lldb.eBasicTypeBool)
] ]
def update(self):
self._children_count = int(evaluate("(int)Konan_DebugGetFieldCount({})".format(self._ptr)).GetValue())
self._children_types = [ self._children_types = [
evaluate("(int)Konan_DebugGetFieldType({}, {})".format(self._ptr, child)).GetValueAsUnsigned() evaluate("(int)Konan_DebugGetFieldType({}, {})".format(self._ptr, child)).GetValueAsUnsigned()
for child in range(self._children_count)] for child in range(self._children_count)]
@@ -137,7 +134,7 @@ class KonanHelperProvider(lldb.SBSyntheticValueProvider):
def _read_value(self, index): def _read_value(self, index):
value_type = self._children_types[index] value_type = self._children_types[index]
address = self._children_type_addresses[index] address = self._children_type_addresses[index]
return self._type_conversion[int(value_type)](address, self._children[index]) return self._type_conversion[int(value_type)](address, str(self._children[index]))
def _create_synthetic_child(self, address, name): def _create_synthetic_child(self, address, name):
index = self.get_child_index(name) index = self.get_child_index(name)
@@ -154,6 +151,9 @@ class KonanHelperProvider(lldb.SBSyntheticValueProvider):
def _deref_or_obj_summary(self, index): def _deref_or_obj_summary(self, index):
value = self._values[index] value = self._values[index]
if not value:
print "_deref_or_obj_summary: value none, index:{}, type:{}".format(index, self._children_types[index])
return None
if check_type_info(value.unsigned): if check_type_info(value.unsigned):
return kotlin_object_type_summary(value, None) return kotlin_object_type_summary(value, None)
else: else:
@@ -180,6 +180,7 @@ class KonanStringSyntheticProvider(KonanHelperProvider):
if not error.Success(): if not error.Success():
raise DebuggerException() raise DebuggerException()
self._representation = s if error.Success() else fallback self._representation = s if error.Success() else fallback
self._logger = lldb.formatters.Logger.Logger()
def update(self): def update(self):
pass pass
@@ -207,13 +208,6 @@ class DebuggerException(Exception):
class KonanObjectSyntheticProvider(KonanHelperProvider): class KonanObjectSyntheticProvider(KonanHelperProvider):
def __init__(self, valobj): def __init__(self, valobj):
super(KonanObjectSyntheticProvider, self).__init__(valobj) super(KonanObjectSyntheticProvider, self).__init__(valobj)
self._values = []
self.update()
self._logger = lldb.formatters.Logger.Logger()
pass
def update(self):
super(KonanObjectSyntheticProvider, self).update()
error = lldb.SBError() error = lldb.SBError()
self._children = [ self._children = [
self._read_string("(const char *)Konan_DebugGetFieldName({}, (int){})".format(self._ptr, i), error) for i in self._read_string("(const char *)Konan_DebugGetFieldName({}, (int){})".format(self._ptr, i), error) for i in
@@ -247,11 +241,6 @@ class KonanArraySyntheticProvider(KonanHelperProvider):
if self._ptr is None: if self._ptr is None:
return return
valobj.SetSyntheticChildrenGenerated(True) valobj.SetSyntheticChildrenGenerated(True)
self._values = []
self.update()
def update(self):
super(KonanArraySyntheticProvider, self).update()
self._children = [x for x in range(self.num_children())] self._children = [x for x in range(self.num_children())]
self._values = [self._read_value(i) for i in range(self._children_count)] self._values = [self._read_value(i) for i in range(self._children_count)]