X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCast.c;h=4e92814703d6836911229db21266e698fb73ab4f;hb=97b7ce8c891ead3f66c6cc7e61314dfabcf46a17;hp=dfb3ad05d9550b67640489dac1eafae661aab514;hpb=d3b1ccb2d5c5999da084145c34cca85b6f8beff1;p=fw%2Fsdcc

diff --git a/src/SDCCast.c b/src/SDCCast.c
index dfb3ad05..4e928147 100644
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -505,7 +505,7 @@ funcOfType (char *name, sym_link * type, sym_link * argType,
   DCL_TYPE (sym->type) = FUNCTION;
   sym->type->next = copyLinkChain (type);
   sym->etype = getSpec (sym->type);
-  FUNC_ISREENT(sym->type) = rent;
+  FUNC_ISREENT(sym->type) = rent ? 1 : 0;
 
   /* if arguments required */
   if (nArgs)
@@ -753,6 +753,7 @@ processParms (ast * func,
   /* make a copy and change the regparm type to the defined parm */
   actParm->etype = getSpec (actParm->ftype = copyLinkChain (actParm->ftype));
   SPEC_REGPARM (actParm->etype) = SPEC_REGPARM (defParm->etype);
+  SPEC_ARGREG  (actParm->etype) = SPEC_ARGREG (defParm->etype);
   (*parmNumber)++;
   return 0;
 }
@@ -950,6 +951,13 @@ createIvalCharPtr (ast * sym, sym_link * type, ast * iexpr)
 			       newNode ('[', sym,
 				   newAst_VALUE (valueFromLit ((float) i))),
 			       newAst_VALUE (valueFromLit (*s))));
+
+      // now we don't need iexpr's symbol anymore
+      {
+	symbol *sym=AST_SYMBOL(iexpr);
+	memmap *segment=SPEC_OCLS(sym->etype);
+	deleteSetItem(&segment->syms, sym);
+      }
       return decorateType (resolveSymbols (rast));
     }
 
@@ -1633,9 +1641,16 @@ isConformingBody (ast * pbody, symbol * sym, ast * body)
       if (astHasVolatile (pbody->left))
 	return FALSE;
 
-      if (IS_AST_SYM_VALUE (pbody->left) &&
-	  isSymbolEqual (AST_SYMBOL (pbody->left), sym))
-	return FALSE;
+      if (IS_AST_SYM_VALUE (pbody->left)) {
+	// if the loopvar has an assignment
+	if (isSymbolEqual (AST_SYMBOL (pbody->left), sym))
+	  return FALSE;
+	// if the loopvar is used in another (maybe conditional) block
+	if (astHasSymbol (pbody->right, sym) &&
+	    (pbody->level > body->level)) {
+	  return FALSE;
+	}
+      }
 
       if (astHasVolatile (pbody->left))
 	return FALSE;