Commit 41b01e99 authored by gsamain's avatar gsamain

handle the no type => pyobj case fot lock getters

parent 8dedaa53
...@@ -711,10 +711,10 @@ class ExprNode(Node): ...@@ -711,10 +711,10 @@ class ExprNode(Node):
return self.tracked_state.needs_wlock return self.tracked_state.needs_wlock
def is_autolock(self): def is_autolock(self):
return self.type.is_cyp_class and self.type.lock_mode == "autolock" return self.type is not None and self.type.is_cyp_class and self.type.lock_mode == "autolock"
def is_checklock(self): def is_checklock(self):
return self.type.is_cyp_class and self.type.lock_mode == "checklock" return self.type is not None and self.type.is_cyp_class and self.type.lock_mode == "checklock"
def get_tracked_state(self, env): def get_tracked_state(self, env):
if not hasattr(self, 'entry') or not self.entry or not self.entry.type.is_cyp_class: if not hasattr(self, 'entry') or not self.entry or not self.entry.type.is_cyp_class:
...@@ -726,14 +726,14 @@ class ExprNode(Node): ...@@ -726,14 +726,14 @@ class ExprNode(Node):
env.declare_autolocked(self) env.declare_autolocked(self)
def is_rhs_locked(self, env): def is_rhs_locked(self, env):
if not hasattr(self, 'entry') or not self.entry.type.is_cyp_class: if not hasattr(self, 'entry') or self.entry.type is None or not self.entry.type.is_cyp_class:
# These nodes couldn't be tracked (because it is for example a constant), # These nodes couldn't be tracked (because it is for example a constant),
# so we let them pass silently # so we let them pass silently
return True return True
return self.tracked_state.is_rlocked or self.tracked_state.is_wlocked return self.tracked_state.is_rlocked or self.tracked_state.is_wlocked
def is_lhs_locked(self, env): def is_lhs_locked(self, env):
if not hasattr(self, 'entry') or not self.entry.type.is_cyp_class: if not hasattr(self, 'entry') or self.entry.type is None or not self.entry.type.is_cyp_class:
# These nodes couldn't be tracked (because it is for example a constant), # These nodes couldn't be tracked (because it is for example a constant),
# so we let them pass silently # so we let them pass silently
return True return True
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment