Prevent misoptimization of register variable, also for consitency added

jsqIterateDestroy.

Author: feodor

jsquery.h

@@ -123,6 +123,7 @@ extern int32	jsqGetIsType(JsQueryItem *v);
 extern char * jsqGetString(JsQueryItem *v, int32 *len);
 extern void jsqIterateInit(JsQueryItem *v);
 extern bool jsqIterateArray(JsQueryItem *v, JsQueryItem *e);
+extern void jsqIterateDestroy(JsQueryItem *v);
 
 void alignStringInfoInt(StringInfo buf);
 

jsquery_op.c

@@ -273,7 +273,8 @@ executeArrayOp(JsQueryItem *jsq, int32 op, JsonbValue *jb)
 	int32			r = 0; /* keep static analyzer quiet */
 	JsonbIterator	*it;
 	JsonbValue		v;
-	JsQueryItem	elem;
+	JsQueryItem		elem;
+	bool			res;
 
 	if (JsonbType(jb) != jbvArray)
 		return false;
@@ -284,7 +285,7 @@ executeArrayOp(JsQueryItem *jsq, int32 op, JsonbValue *jb)
 	{
 		while(jsqIterateArray(jsq, &elem))
 		{
-			bool res = false;
+			res = false;
 
 			it = JsonbIteratorInit(jb->val.binary.data);
 
@@ -306,7 +307,7 @@ executeArrayOp(JsQueryItem *jsq, int32 op, JsonbValue *jb)
 		{
 			if (r == WJB_ELEM)
 			{
-				bool res = false;
+				res = false;
 
 				jsqIterateInit(jsq);
 				while(jsqIterateArray(jsq, &elem))
@@ -319,6 +320,7 @@ executeArrayOp(JsQueryItem *jsq, int32 op, JsonbValue *jb)
 						break;
 					}
 				}
+				jsqIterateDestroy(jsq);
 
 				if (op == jqiContained && res == false)
 					return false;

jsquery_support.c

@@ -252,3 +252,11 @@ jsqIterateArray(JsQueryItem *v, JsQueryItem *e)
 	}
 }
 
+void
+jsqIterateDestroy(JsQueryItem *v)
+{
+	Assert(v->type == jqiArray);
+	Assert(v->array.current <= v->array.current);
+	v->array.current++;
+}
+