Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

Fixed bug #1067706 (wrong const folding in mutually recursive udfs)

Fixed bug #1067706 (wrong const folding in mutually recursive udfs)

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-10-19T20-51-12.253Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job markos-scratch-2012-10-19T20-51-12.253Z is finished.
  The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/markos-scratch]

10972. By Markos Zaharioudakis on 2012-10-20

Fixed bug #1067706 (wrong const folding in mutually recursive udfs)

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-10-20T07-37-00.683Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2012-10-20T07-37-00.683Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-10-16 13:08:12 +0000
+++ ChangeLog	2012-10-20 07:27:24 +0000
@@ -14,6 +14,7 @@
   * Fixed bug #1061222 (bad message for errors in index key type declaration)
   * Fixed bug #1065175 (preceding::node()[1] returns wrong results)
   * Fixed bug #1065321 (following:text() doesn't return results in doc order)
+  * Fixed bug #1067706 (wrong const folding in mutually recursive udfs)
   * Fixed bug #1021492 (while computeing the "sources" of a prolog var, skip
     any var-setting exprs that appear in non-used (and non-optimized) functions). 
 

=== modified file 'src/compiler/expression/var_expr.cpp'
--- src/compiler/expression/var_expr.cpp	2012-10-09 14:06:08 +0000
+++ src/compiler/expression/var_expr.cpp	2012-10-20 07:27:24 +0000
@@ -90,8 +90,6 @@
   theHasInitializer(false)
 {
   compute_scripting_kind();
-
-  setUnfoldable(ANNOTATION_TRUE_FIXED);
 }
 
 

=== modified file 'src/compiler/rewriter/framework/rule_driver.cpp'
--- src/compiler/rewriter/framework/rule_driver.cpp	2012-09-19 21:16:15 +0000
+++ src/compiler/rewriter/framework/rule_driver.cpp	2012-10-20 07:27:24 +0000
@@ -20,6 +20,8 @@
 #include "compiler/rewriter/rules/rule_base.h"
 #include "compiler/rewriter/framework/rewriter_context.h"
 
+#include "functions/udf.h"
+
 #include "system/properties.h"
 
 
@@ -60,9 +62,14 @@
       bool rule_modified = false;
       expr* newRoot = (*i)->apply(rCtx, &*rCtx.getRoot(), rule_modified);
 
-      if (newRoot != NULL)
+      if (newRoot != NULL && newRoot != rCtx.theRoot)
       {
         rCtx.setRoot(newRoot);
+        if (rCtx.theUDF != NULL)
+        {
+          rCtx.theUDF->setBody(newRoot);
+          rCtx.theUDF->invalidatePlan();
+        }
       }
 
       if (rule_modified)
@@ -70,6 +77,11 @@
         modified = true;
         totalModified = true;
 
+        if (rCtx.theUDF != NULL)
+        {
+          rCtx.theUDF->invalidatePlan();
+        }
+
         if (Properties::instance()->printIntermediateOpt())
         {
           std::cout << rCtx.theMessage << std::endl
@@ -99,10 +111,20 @@
   if (newRoot != NULL)
   {
     rCtx.setRoot(newRoot);
+    if (rCtx.theUDF != NULL)
+    {
+      rCtx.theUDF->setBody(newRoot);
+      rCtx.theUDF->invalidatePlan();
+    }
   }
 
   if (modified && Properties::instance()->printIntermediateOpt())
   {
+    if (rCtx.theUDF != NULL)
+    {
+      rCtx.theUDF->invalidatePlan();
+    }
+
     std::cout << rCtx.theMessage << std::endl
               << "After " << theRule->getRuleName() << " :" << std::endl;
     rCtx.getRoot()->put(std::cout) << std::endl;

=== modified file 'src/compiler/rewriter/framework/rule_driver.h'
--- src/compiler/rewriter/framework/rule_driver.h	2012-09-19 21:16:15 +0000
+++ src/compiler/rewriter/framework/rule_driver.h	2012-10-20 07:27:24 +0000
@@ -84,7 +84,7 @@
 ********************************************************************************/
 class RuleOnceDriverBase : public Rewriter 
 {
-private:
+protected:
   rule_ptr_t theRule;
 
 public:
@@ -99,6 +99,8 @@
 {
 public:
   RuleOnceDriver() : RuleOnceDriverBase(rule_ptr_t(new R)) {}
+
+  R* getRule() const { return static_cast<R*>(theRule.getp()); }
 };
 
 

=== modified file 'src/compiler/rewriter/rewriters/default_optimizer.cpp'
--- src/compiler/rewriter/rewriters/default_optimizer.cpp	2012-10-08 12:09:36 +0000
+++ src/compiler/rewriter/rewriters/default_optimizer.cpp	2012-10-20 07:27:24 +0000
@@ -88,6 +88,13 @@
   if (driverPathSimplify.rewrite(rCtx))
     modified = true;
 
+  if (rCtx.theUDF != NULL)
+  {
+    RuleOnceDriver<MarkExprs> driverMarkLocalExprs;
+    driverMarkLocalExprs.getRule()->setLocal(true);
+    driverMarkLocalExprs.rewrite(rCtx);
+  }
+
  repeat1:
 
   // TypeRules

=== modified file 'src/compiler/rewriter/rules/fold_rules.cpp'
--- src/compiler/rewriter/rules/fold_rules.cpp	2012-10-10 13:05:50 +0000
+++ src/compiler/rewriter/rules/fold_rules.cpp	2012-10-20 07:27:24 +0000
@@ -171,8 +171,8 @@
   BoolAnnotationValue saveUnfoldable = node->getUnfoldable();
   BoolAnnotationValue saveContainsRecursiveCall = node->getContainsRecursiveCall();
 
-  // By default, an expr is discardable, foldable, and does not contain
-  // recursive calls
+  // By default, an expr is discardable, foldable,  does not contain recursive
+  // calls, and returns constructed nodes.
   BoolAnnotationValue curNonDiscardable = ANNOTATION_FALSE;
   BoolAnnotationValue curUnfoldable = ANNOTATION_FALSE;
   BoolAnnotationValue curContainsRecursiveCall = ANNOTATION_FALSE;
@@ -185,12 +185,14 @@
     fo_expr* fo = static_cast<fo_expr *>(node);
     function* f = fo->get_func();
 
-    if (f->isUdf())
+    if (f->isUdf() && !theIsLocal)
     {
       user_function* udf = static_cast<user_function*>(f);
 
       if (!udf->isOptimized())
       {
+        // we can be here in case of mutually recursive udfs or during plan
+        // serialization and udf was not callable by the main program
         udf->optimize();
       }
 
@@ -283,17 +285,24 @@
         fo_expr* fo = static_cast<fo_expr *>(node);
         function* f = fo->get_func();
 
-        bool isErrorFunc = (dynamic_cast<const fn_error*>(f) != NULL);
+        if (f->isUdf() && theIsLocal)
+        {
+          curUnfoldable = saveUnfoldable;
+        }
+        else
+        {
+          bool isErrorFunc = (dynamic_cast<const fn_error*>(f) != NULL);
 
-        // Do not fold functions that always require access to the dynamic context,
-        // or may need to access the implicit timezone (which is also in the dynamic
-        // constext).
-        if (isErrorFunc ||
-            f->accessesDynCtx() ||
-            maybe_needs_implicit_timezone(fo) ||
-            !f->isDeterministic())
-        {
-          curUnfoldable = ANNOTATION_TRUE_FIXED;
+          // Do not fold functions that always require access to the dynamic context,
+          // or may need to access the implicit timezone (which is also in the dynamic
+          // constext).
+          if (isErrorFunc ||
+              f->accessesDynCtx() ||
+              maybe_needs_implicit_timezone(fo) ||
+              !f->isDeterministic())
+          {
+            curUnfoldable = ANNOTATION_TRUE_FIXED;
+          }
         }
 
         break;
@@ -560,6 +569,7 @@
   return NULL;
 }
 
+
 RULE_REWRITE_POST(FoldConst)
 {
   return NULL;
@@ -647,28 +657,38 @@
     xqtref_t argType = arg->get_return_type();
     xqtref_t targetType = cbe->get_target_type();
 
-    if (TypeOps::is_subtype(tm, *argType, *targetType, node->get_loc()))
-    {
-      return rCtx.theEM->create_const_expr(sctx, udf, LOC(node), true);
-    }
-    else if (node->get_expr_kind() == instanceof_expr_kind)
-    {
-      instanceof_expr* ioExpr = static_cast<instanceof_expr*>(node);
-
-      if (ioExpr->getCheckPrimeOnly())
-      {
-        argType = TypeOps::prime_type(tm, *argType);
-        targetType = TypeOps::prime_type(tm, *targetType);
-      }
-
-      return (TypeOps::intersect_type(*argType, *targetType, tm) ==
-              GENV_TYPESYSTEM.NONE_TYPE ?
-              rCtx.theEM->create_const_expr(sctx, udf, LOC(node), false) :
-              NULL);
-    }
-    else
-    {
-      return NULL;
+    try
+    {
+      if (TypeOps::is_subtype(tm, *argType, *targetType, node->get_loc()))
+      {
+        return rCtx.theEM->create_const_expr(sctx, udf, LOC(node), true);
+      }
+      else if (node->get_expr_kind() == instanceof_expr_kind)
+      {
+        instanceof_expr* ioExpr = static_cast<instanceof_expr*>(node);
+
+        if (ioExpr->getCheckPrimeOnly())
+        {
+          argType = TypeOps::prime_type(tm, *argType);
+          targetType = TypeOps::prime_type(tm, *targetType);
+        }
+
+        return (TypeOps::intersect_type(*argType, *targetType, tm) ==
+                GENV_TYPESYSTEM.NONE_TYPE ?
+                rCtx.theEM->create_const_expr(sctx, udf, LOC(node), false) :
+                NULL);
+      }
+      else
+      {
+        return NULL;
+      }
+    }
+    catch (XQueryException& e)
+    {
+      if (e.diagnostic() == err::XPTY0004)
+        return NULL;
+
+      throw;
     }
   }
 

=== modified file 'src/compiler/rewriter/rules/ruleset.h'
--- src/compiler/rewriter/rules/ruleset.h	2012-10-12 09:05:54 +0000
+++ src/compiler/rewriter/rules/ruleset.h	2012-10-20 07:27:24 +0000
@@ -84,8 +84,18 @@
 ********************************************************************************/
 class MarkExprs : public RewriteRule
 {
+protected:
+  bool theIsLocal;
+
 public:
-  MarkExprs() : RewriteRule(RewriteRule::MarkExprs, "MarkExprs") {}
+  MarkExprs(bool local = false)
+    :
+    RewriteRule(RewriteRule::MarkExprs, "MarkExprs"),
+    theIsLocal(local)
+  {
+  }
+
+  void setLocal(bool v) { theIsLocal = v; }
 
   expr* apply(RewriterContext& rCtx, expr* node, bool& modified);
 };

=== modified file 'src/compiler/rewriter/tools/udf_graph.cpp'
--- src/compiler/rewriter/tools/udf_graph.cpp	2012-09-19 21:16:15 +0000
+++ src/compiler/rewriter/tools/udf_graph.cpp	2012-10-20 07:27:24 +0000
@@ -274,7 +274,7 @@
 
   bool deterministic = true;
 
-  for (ulong i = 0; i < node->theChildren.size(); ++i)
+  for (csize i = 0; i < node->theChildren.size(); ++i)
   {
     if (inferDeterminism(node->theChildren[i], visit) == false)
       deterministic = false;
@@ -330,7 +330,7 @@
 
   o << inc_indent;
 
-  for (ulong i = 0; i < node->theChildren.size(); ++i)
+  for (csize i = 0; i < node->theChildren.size(); ++i)
   {
     display(o, node->theChildren[i]);
   }

=== modified file 'src/compiler/rewriter/tools/udf_graph.h'
--- src/compiler/rewriter/tools/udf_graph.h	2012-09-19 21:16:15 +0000
+++ src/compiler/rewriter/tools/udf_graph.h	2012-10-20 07:27:24 +0000
@@ -116,8 +116,6 @@
 
   ~UDFGraph();
 
-  void build(const expr* e);
-
   void optimizeUDFs(CompilerCB* ccb);
 
   void inferDeterminism();
@@ -125,6 +123,8 @@
   void display(std::ostream& o);
 
 protected:
+  void build(const expr* e);
+
   void build(const expr* curExpr, std::vector<user_function*>& callChain);
 
   void addEdge(user_function* caller, user_function* callee);

=== modified file 'src/context/dynamic_context.h'
--- src/context/dynamic_context.h	2012-10-08 12:09:36 +0000
+++ src/context/dynamic_context.h	2012-10-20 07:27:24 +0000
@@ -55,7 +55,13 @@
 
 public:
 
-  static enum  ID_VARS { IDVAR_CONTEXT_ITEM=1, IDVAR_CONTEXT_ITEM_POSITION, IDVAR_CONTEXT_ITEM_SIZE, MAX_IDVARS_RESERVED  } IDVARS_RESERVED;
+  static enum ID_VARS 
+  {
+    IDVAR_CONTEXT_ITEM=1,
+    IDVAR_CONTEXT_ITEM_POSITION,
+    IDVAR_CONTEXT_ITEM_SIZE,
+    MAX_IDVARS_RESERVED
+  } IDVARS_RESERVED;
 
   struct VarValue
   {
@@ -69,8 +75,8 @@
 
     union
     {
-      store::Item*     item;
-      store::TempSeq*  temp_seq;
+      store::Item     * item;
+      store::TempSeq  * temp_seq;
     }           theValue;
 
     ValueState  theState;
@@ -102,8 +108,8 @@
       ext_func_param_typed 
     } val_type_t;
 
-    val_type_t  type;
-    void*       func_param;
+    val_type_t    type;
+    void        * func_param;
   };
 
   ZSTRING_HASH_MAP(dctx_value_t, ValueMap);
@@ -116,6 +122,7 @@
   dynamic_context            * theParent;
 
   store::Item_t                theCurrentDateTime;
+
   long                         theTimezone;
 
   store::Item_t                theDefaultCollectionUri;
@@ -128,7 +135,7 @@
 
   IndexMap                   * theAvailableMaps;
 
-    //MODIFY
+  //MODIFY
   EnvVarMap                  * theEnvironmentVariables;
 
 public:

=== modified file 'src/functions/udf.cpp'
--- src/functions/udf.cpp	2012-10-12 09:05:54 +0000
+++ src/functions/udf.cpp	2012-10-20 07:27:24 +0000
@@ -297,7 +297,8 @@
 ********************************************************************************/
 bool user_function::isRecursive() const
 {
-  assert(isOptimized());
+  // recursiveness is established before any optimization is done
+  // assert(isOptimized());
   assert(theBodyExpr != NULL);
   return !theMutuallyRecursiveUDFs.empty();
 }
@@ -308,7 +309,8 @@
 ********************************************************************************/
 bool user_function::isMutuallyRecursiveWith(const user_function* udf)
 {
-  assert(isOptimized());
+  // recursiveness is established before any optimization is done
+  // assert(isOptimized());
   assert(theBodyExpr != NULL);
 
   if (std::find(theMutuallyRecursiveUDFs.begin(),
@@ -332,6 +334,9 @@
     assert(isOptimized());
   }
 
+  if (theBodyExpr != NULL)
+    return theBodyExpr->isUnfoldable();
+
   return testFlag(FunctionConsts::AccessesDynCtx);
 }
 

=== modified file 'src/runtime/core/fncall_iterator.cpp'
--- src/runtime/core/fncall_iterator.cpp	2012-09-19 21:16:15 +0000
+++ src/runtime/core/fncall_iterator.cpp	2012-10-20 07:27:24 +0000
@@ -448,31 +448,34 @@
 
       for (size_t i = 0; i < argsRefs.size(); ++i)
       {
-        const ArgVarRefs& argVarRefs = argsRefs[i];
-        store::Iterator_t argWrapper;
-        if (state->theCache)
-        {
-          std::vector<store::Item_t> lParam(1, lKey[i]);
-          state->theArgValues.push_back(GENV_STORE.createTempSeq(lParam));
-          argWrapper = state->theArgValues.back()->getIterator();
-          argWrapper->open();
-        }
-        else
-        {
-          argWrapper = argWraps[i];
-        }
-
-        ArgVarRefs::const_iterator argVarRefsIte = argVarRefs.begin();
-        ArgVarRefs::const_iterator argVarRefsEnd = argVarRefs.end();
-
-        for (; argVarRefsIte != argVarRefsEnd; ++argVarRefsIte)
-        {
-          const LetVarIter_t& argRef = (*argVarRefsIte);
-          assert(argRef != NULL);
-
-          if (argRef != NULL)
-          {
-            argRef->bind(argWrapper, *state->thePlanState);
+        if (argWraps[i] != NULL)
+        {
+          const ArgVarRefs& argVarRefs = argsRefs[i];
+          store::Iterator_t argWrapper;
+          if (state->theCache)
+          {
+            std::vector<store::Item_t> lParam(1, lKey[i]);
+            state->theArgValues.push_back(GENV_STORE.createTempSeq(lParam));
+            argWrapper = state->theArgValues.back()->getIterator();
+            argWrapper->open();
+          }
+          else
+          {
+            argWrapper = argWraps[i];
+          }
+
+          ArgVarRefs::const_iterator argVarRefsIte = argVarRefs.begin();
+          ArgVarRefs::const_iterator argVarRefsEnd = argVarRefs.end();
+
+          for (; argVarRefsIte != argVarRefsEnd; ++argVarRefsIte)
+          {
+            const LetVarIter_t& argRef = (*argVarRefsIte);
+            assert(argRef != NULL);
+            
+            if (argRef != NULL)
+            {
+              argRef->bind(argWrapper, *state->thePlanState);
+            }
           }
         }
       }

=== removed file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec.iter	2012-09-19 21:16:15 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec.iter	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-Iterator tree for main query:
-<UDFunctionCallIterator cached="true">
-  <SingletonIterator value="xs:integer(100)"/>
-</UDFunctionCallIterator>
-
-Iterator tree for local:fib:
-<flwor::FLWORIterator>
-  <ForVariable name="n">
-    <LetVarIterator varname="n"/>
-  </ForVariable>
-  <ReturnClause>
-    <IfThenElseIterator>
-      <TypedValueCompareIterator_INTEGER>
-        <ForVarIterator varname="n"/>
-        <SingletonIterator value="xs:integer(0)"/>
-      </TypedValueCompareIterator_INTEGER>
-      <SingletonIterator value="xs:integer(0)"/>
-      <IfThenElseIterator>
-        <TypedValueCompareIterator_INTEGER>
-          <ForVarIterator varname="n"/>
-          <SingletonIterator value="xs:integer(1)"/>
-        </TypedValueCompareIterator_INTEGER>
-        <SingletonIterator value="xs:integer(1)"/>
-        <SpecificNumArithIterator_AddOperation_INTEGER>
-          <UDFunctionCallIterator cached="true">
-            <SpecificNumArithIterator_SubtractOperation_INTEGER>
-              <ForVarIterator varname="n"/>
-              <SingletonIterator value="xs:integer(1)"/>
-            </SpecificNumArithIterator_SubtractOperation_INTEGER>
-          </UDFunctionCallIterator>
-          <UDFunctionCallIterator cached="true">
-            <SpecificNumArithIterator_SubtractOperation_INTEGER>
-              <ForVarIterator varname="n"/>
-              <SingletonIterator value="xs:integer(2)"/>
-            </SpecificNumArithIterator_SubtractOperation_INTEGER>
-          </UDFunctionCallIterator>
-        </SpecificNumArithIterator_AddOperation_INTEGER>
-      </IfThenElseIterator>
-    </IfThenElseIterator>
-  </ReturnClause>
-</flwor::FLWORIterator>
-

=== added file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec2.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec2.iter	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-fib-rec2.iter	2012-10-20 07:27:24 +0000
@@ -0,0 +1,45 @@
+Iterator tree for const-folded expr:
+<UDFunctionCallIterator cached="true">
+  <SingletonIterator value="xs:integer(10)"/>
+</UDFunctionCallIterator>
+
+Iterator tree for local:fib:
+<flwor::FLWORIterator>
+  <ForVariable name="n">
+    <LetVarIterator varname="n"/>
+  </ForVariable>
+  <ReturnClause>
+    <IfThenElseIterator>
+      <TypedValueCompareIterator_INTEGER>
+        <ForVarIterator varname="n"/>
+        <SingletonIterator value="xs:integer(0)"/>
+      </TypedValueCompareIterator_INTEGER>
+      <SingletonIterator value="xs:integer(0)"/>
+      <IfThenElseIterator>
+        <TypedValueCompareIterator_INTEGER>
+          <ForVarIterator varname="n"/>
+          <SingletonIterator value="xs:integer(1)"/>
+        </TypedValueCompareIterator_INTEGER>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SpecificNumArithIterator_AddOperation_INTEGER>
+          <UDFunctionCallIterator cached="true">
+            <SpecificNumArithIterator_SubtractOperation_INTEGER>
+              <ForVarIterator varname="n"/>
+              <SingletonIterator value="xs:integer(1)"/>
+            </SpecificNumArithIterator_SubtractOperation_INTEGER>
+          </UDFunctionCallIterator>
+          <UDFunctionCallIterator cached="true">
+            <SpecificNumArithIterator_SubtractOperation_INTEGER>
+              <ForVarIterator varname="n"/>
+              <SingletonIterator value="xs:integer(2)"/>
+            </SpecificNumArithIterator_SubtractOperation_INTEGER>
+          </UDFunctionCallIterator>
+        </SpecificNumArithIterator_AddOperation_INTEGER>
+      </IfThenElseIterator>
+    </IfThenElseIterator>
+  </ReturnClause>
+</flwor::FLWORIterator>
+
+Iterator tree for main query:
+<SingletonIterator value="xs:integer(55)"/>
+

=== added file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-recursive-1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-recursive-1.iter	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-recursive-1.iter	2012-10-20 07:27:24 +0000
@@ -0,0 +1,68 @@
+Iterator tree for const-folded expr:
+<UDFunctionCallIterator cached="true">
+  <SingletonIterator value="xs:integer(4)"/>
+</UDFunctionCallIterator>
+
+Iterator tree for local:get-request-id2:
+<flwor::FLWORIterator>
+  <LetVariable name="p" materialize="true">
+    <LetVarIterator varname="p"/>
+  </LetVariable>
+  <ReturnClause>
+    <UDFunctionCallIterator cached="true">
+      <SingletonIterator value="xs:integer(4)"/>
+    </UDFunctionCallIterator>
+  </ReturnClause>
+</flwor::FLWORIterator>
+
+Iterator tree for local:get-request-id1:
+<PromoteIterator type="xs:string">
+  <flwor::FLWORIterator>
+    <LetVariable name="p" materialize="true">
+      <LetVarIterator varname="p"/>
+    </LetVariable>
+    <ReturnClause>
+      <flwor::FLWORIterator>
+        <ForVariable name="i">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(3)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ReturnClause>
+          <UDFunctionCallIterator cached="true">
+            <SingletonIterator value="xs:integer(4)"/>
+          </UDFunctionCallIterator>
+        </ReturnClause>
+      </flwor::FLWORIterator>
+    </ReturnClause>
+  </flwor::FLWORIterator>
+</PromoteIterator>
+
+Iterator tree for main query:
+<UDFunctionCallIterator cached="true">
+  <SingletonIterator value="xs:integer(1)"/>
+</UDFunctionCallIterator>
+
+Iterator tree for local:get-request-id1:
+<PromoteIterator type="xs:string">
+  <flwor::FLWORIterator>
+    <ForVariable name="i">
+      <OpToIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(3)"/>
+      </OpToIterator>
+    </ForVariable>
+    <ReturnClause>
+      <UDFunctionCallIterator cached="true">
+        <SingletonIterator value="xs:integer(4)"/>
+      </UDFunctionCallIterator>
+    </ReturnClause>
+  </flwor::FLWORIterator>
+</PromoteIterator>
+
+Iterator tree for local:get-request-id2:
+<UDFunctionCallIterator cached="true">
+  <SingletonIterator value="xs:integer(4)"/>
+</UDFunctionCallIterator>
+

=== added file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-recursive-2.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-recursive-2.iter	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf-recursive-2.iter	2012-10-20 07:27:24 +0000
@@ -0,0 +1,49 @@
+Iterator tree for const-folded expr:
+<UDFunctionCallIterator>
+  <FnConcatIterator/>
+</UDFunctionCallIterator>
+
+Iterator tree for local:recursion:
+<flwor::FLWORIterator>
+  <LetVariable name="param" materialize="true">
+    <LetVarIterator varname="param"/>
+  </LetVariable>
+  <ReturnClause>
+    <IfThenElseIterator>
+      <FnBooleanIterator>
+        <LetVarIterator varname="param"/>
+      </FnBooleanIterator>
+      <UDFunctionCallIterator>
+        <FnConcatIterator/>
+      </UDFunctionCallIterator>
+      <SingletonIterator value="xs:boolean(false)"/>
+    </IfThenElseIterator>
+  </ReturnClause>
+</flwor::FLWORIterator>
+
+Iterator tree for const-folded expr:
+<SingletonIterator value="xs:boolean(false)"/>
+
+Iterator tree for main query:
+<UDFunctionCallIterator>
+  <TreatIterator type="[NodeXQType elementNode content=[UserDefinedXQType   Content@http://foo.com/schemas/schema isComplex emptyContent base:[XQType ANY_TYPE_KIND*] ]]" quant="?">
+    <ValidateIterator>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(http://foo.com/schemas/schema,d,Content)"/>
+        <AttributeIterator qname="xs:QName(,,id)">
+          <SingletonIterator value="xs:string(foo)"/>
+        </AttributeIterator>
+      </ElementIterator>
+    </ValidateIterator>
+  </TreatIterator>
+</UDFunctionCallIterator>
+
+Iterator tree for local:recursion:
+<IfThenElseIterator>
+  <FnBooleanIterator>
+    <LetVarIterator varname="param"/>
+  </FnBooleanIterator>
+  <SingletonIterator value="xs:boolean(false)"/>
+  <SingletonIterator value="xs:boolean(false)"/>
+</IfThenElseIterator>
+

=== added file 'test/rbkt/ExpQueryResults/zorba/optim/no_folding_01.xml.res'
--- test/rbkt/ExpQueryResults/zorba/optim/no_folding_01.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/optim/no_folding_01.xml.res	2012-10-20 07:27:24 +0000
@@ -0,0 +1,1 @@
+1

=== added file 'test/rbkt/ExpQueryResults/zorba/udf/udf-fib-rec2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/udf/udf-fib-rec2.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/udf/udf-fib-rec2.xml.res	2012-10-20 07:27:24 +0000
@@ -0,0 +1,1 @@
+55

=== added file 'test/rbkt/Queries/zorba/optim/no_folding_01.xq'
--- test/rbkt/Queries/zorba/optim/no_folding_01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/optim/no_folding_01.xq	2012-10-20 07:27:24 +0000
@@ -0,0 +1,22 @@
+
+
+declare variable $g := 1;
+
+
+declare function local:boo()
+{
+  local:foo(0)
+};
+
+
+declare function local:foo($x) as xs:integer
+{
+  if ($x > 0)
+  then
+    local:boo()
+  else
+    $g
+};
+
+
+local:boo()

=== modified file 'test/rbkt/Queries/zorba/reference/reference_5.xq'
--- test/rbkt/Queries/zorba/reference/reference_5.xq	2012-09-19 21:16:15 +0000
+++ test/rbkt/Queries/zorba/reference/reference_5.xq	2012-10-20 07:27:24 +0000
@@ -8,22 +8,35 @@
 
 
 <result>
-<temporary-variable-in-scope>{let $temp:=<root>temp</root> return id:node-by-reference(id:node-reference($temp))}</temporary-variable-in-scope>
-<temporary-variable-in-scope>{
-let $temp:=<root>temp</root> 
-return
-let $ref:=id:node-reference($temp)
-return
-id:node-by-reference($ref)
-}</temporary-variable-in-scope>
-<temporary-variable-in-scope>{
-for $i in (1 to 3)
-let $temp:=<root>temp</root> 
-let $ref:=id:node-reference($temp)
-return
-id:node-by-reference($ref)
-}</temporary-variable-in-scope>
-
-<temporary-variable-in-scope>{let $temp:=<root>temp</root> return id:node-by-reference(id:node-reference($temp))}</temporary-variable-in-scope>
+
+<temporary-variable-in-scope>
+{
+  let $temp:=<root>temp</root> return id:node-by-reference(id:node-reference($temp))
+}
+</temporary-variable-in-scope>
+
+<temporary-variable-in-scope>
+{
+  let $temp:=<root>temp</root> 
+  return
+    let $ref:=id:node-reference($temp)
+    return id:node-by-reference($ref)
+}
+</temporary-variable-in-scope>
+
+<temporary-variable-in-scope>
+{
+  for $i in (1 to 3)
+  let $temp := <root>temp</root> 
+  let $ref := id:node-reference($temp)
+  return id:node-by-reference($ref)
+}
+</temporary-variable-in-scope>
+
+<temporary-variable-in-scope>
+{
+  let $temp:=<root>temp</root> return id:node-by-reference(id:node-reference($temp))
+}
+</temporary-variable-in-scope>
 
 </result>

=== added file 'test/rbkt/Queries/zorba/udf/udf-fib-rec2.xq'
--- test/rbkt/Queries/zorba/udf/udf-fib-rec2.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/udf/udf-fib-rec2.xq	2012-10-20 07:27:24 +0000
@@ -0,0 +1,8 @@
+declare function local:fib($n as xs:integer) as xs:integer
+{
+  if ($n eq 0) then 0 
+  else if ($n eq 1) then 1 
+  else local:fib($n - 1) + local:fib($n - 2)
+};
+
+local:fib(10)