* src/SDCCglue.c: reverted back to 1.124

[fw/sdcc] / src / SDCCast.c

diff --git a/src/SDCCast.c b/src/SDCCast.c
index b4933cb2b5c3fbd7ad4613f00ebbaa5a49756317..c92f179b3b1aeb2086d18e374432f25a505db952 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -972,8 +972,7 @@ createIvalCharPtr (ast * sym, sym_link * type, ast * iexpr)
        memmap *segment=SPEC_OCLS(sym->etype);
        deleteSetItem(&segment->syms, sym);
       }
-      
-      return decorateType(resolveSymbols (rast));
+      return decorateType (resolveSymbols (rast));
     }
 
   return NULL;
@@ -1058,9 +1057,8 @@ gatherAutoInit (symbol * autoChain)
     {
 
       /* resolve the symbols in the ival */
-      if (sym->ival) {
+      if (sym->ival)
        resolveIvalSym (sym->ival);
-      }
 
       /* if this is a static variable & has an */
       /* initial value the code needs to be lifted */
@@ -1231,10 +1229,6 @@ bool constExprTree (ast *cexpr) {
        // a function's address will never change
        return TRUE;
       }
-      if (IS_AST_SYM_VALUE(cexpr) && IS_ARRAY(AST_SYMBOL(cexpr)->type)) {
-       // an array's address will never change
-       return TRUE;
-      }
       if (IS_AST_SYM_VALUE(cexpr) && 
          IN_CODESPACE(SPEC_OCLS(AST_SYMBOL(cexpr)->etype))) {
        // a symbol in code space will never change