From f3ff43f7366553c9f3b64298e29f766dd7a1fbd6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 19 Aug 2015 20:26:51 +0300
Subject: Skip CLEANUP_POINT_EXPR node as other NOP nodes.

---
 src/analysis/analysis.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/analysis/analysis.cpp b/src/analysis/analysis.cpp
index 6ccd658..8b76a6e 100644
--- a/src/analysis/analysis.cpp
+++ b/src/analysis/analysis.cpp
@@ -158,8 +158,9 @@ int findBackLocation(Node *node)
 // skip all child nodes and return non nop child
 Node *skipNop(Node *node)
 {
-    while (node &&
-           (node == NOP_EXPR || node == NON_LVALUE_EXPR))
+    while (node == NOP_EXPR ||
+           node == NON_LVALUE_EXPR ||
+           node == CLEANUP_POINT_EXPR)
     {
         NopExprNode *nop = static_cast<NopExprNode*>(node);
         if (nop && !nop->args.empty())
@@ -173,7 +174,9 @@ Node *skipNop(Node *node)
 // skip all parent nop nodes and return first non nop parent
 Node *skipBackNop(Node *node)
 {
-    while (node && node == NOP_EXPR)
+    while (node == NOP_EXPR ||
+           node == NON_LVALUE_EXPR ||
+           node == CLEANUP_POINT_EXPR)
     {
         node = node->parent;
     }
-- 
cgit v1.2.3-60-g2f50