Author: zhuqing
Date: 2011-08-31 05:29:11 -0400 (Wed, 31 Aug 2011)
New Revision: 3729

Modified:
   trunk/osprey/wgen/wgen_decl.cxx
Log:
Fix bug833, patch provide by Steve. The recursing of WGEN_Expand_Expr will 
break initializer, the fix is to avoid this recursive.

Code Review: Jian Xin & Sun Chan


Modified: trunk/osprey/wgen/wgen_decl.cxx
===================================================================
--- trunk/osprey/wgen/wgen_decl.cxx     2011-08-31 09:16:46 UTC (rev 3728)
+++ trunk/osprey/wgen/wgen_decl.cxx     2011-08-31 09:29:11 UTC (rev 3729)
@@ -2586,21 +2586,9 @@
        case GS_NOP_EXPR:
                gs_t kid;
                kid = gs_tree_operand(val,0);
-               if (gs_tree_code(kid) == GS_ADDR_EXPR &&
-                   /* bug fix for OSP_279 */
-                   gs_tree_code(gs_tree_operand(kid,0)) == GS_STRING_CST)      
-               {
-                       kid = gs_tree_operand(kid,0);
-                       WGEN_Add_Aggregate_Init_Address (kid);
-                       break;
-               }
-               else
-               if (gs_tree_code(kid) == GS_INTEGER_CST) {
-                      WGEN_Add_Aggregate_Init_Integer (
-                              gs_get_integer_value(kid), size);
-                     break;
-               }
-               // fallthru
+               // [SC] NOP_EXPR does not change representation, so just 
recurse on kid.
+               Add_Initv_For_Tree (kid, size);
+               break;
        default:
                {
         WN *init_wn;


------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better 
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel

Reply via email to