fix on-demand integer promotion

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@538 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/src/SDCCast.c b/src/SDCCast.c
index 98a86ac895fd1f32bb10abb736824946652d05a5..c109a873569fb55390593c7c3b0c16bc6746d54f 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -1527,9 +1527,9 @@ void pushTypeCastToLeaves(sym_link *type, ast *node, ast **parentPtr)
         /* We're at a leaf; if it's a value, apply the typecast */
         if (node->type == EX_VALUE && IS_INTEGRAL(TTYPE(node)))
         {
-            *parentPtr = newNode(CAST,
-                                newAst_LINK(copyLinkChain(type)),
-                                node);
+            *parentPtr = decorateType(newNode(CAST,
+                                             newAst_LINK(copyLinkChain(type)),
+                                             node));
        }
     }
     else
@@ -1562,7 +1562,7 @@ void propAsgType(ast *tree)
        return;
     }
     
-    if (getSize(LTYPE(tree)) != getSize(RTYPE(tree)))
+    if (getSize(LTYPE(tree)) > getSize(RTYPE(tree)))
     {
         pushTypeCastToLeaves(LTYPE(tree), tree->right, &(tree->right));
     }
@@ -2756,7 +2756,6 @@ ast *decorateType (ast *tree)
                                     tree->right));
            }
        }
-       pushTypeCastToLeaves(currFunc->type->next, tree->right, &(tree->right));
        
        RRVAL(tree) = 1;
        return tree;