Author: syang
Date: 2010-12-09 14:43:00 -0500 (Thu, 09 Dec 2010)
New Revision: 3428

Modified:
   trunk/osprey/common/com/intrn_entry.def
   trunk/osprey/wgen/wgen_expr.cxx
Log:
Change intrinsic id from INTRN_OBJ_SZ to INTRN_OBJECT_SIZE in order 
to be congruent with a convesion which didn't know about before. 


Modified: trunk/osprey/common/com/intrn_entry.def
===================================================================
--- trunk/osprey/common/com/intrn_entry.def     2010-12-09 19:17:22 UTC (rev 
3427)
+++ trunk/osprey/common/com/intrn_entry.def     2010-12-09 19:43:00 UTC (rev 
3428)
@@ -7672,7 +7672,7 @@
                 IRETURN_PPI4, "__ctype_tolower_loc", "CTYPE_TOLOWER_LOC", 
"__ctype_tolower_loc")
 
 /* corresponding to gcc extension __builtin_object_size()*/
-DEF_INTRN_ENTRY(INTRN_OBJ_SZ, "BUILTIN_OBJECT_SIZE", BYVAL, PURE, 
NO_SIDEEFFECTS, 
+DEF_INTRN_ENTRY(INTRN_OBJECT_SIZE, "BUILTIN_OBJECT_SIZE", BYVAL, PURE, 
NO_SIDEEFFECTS, 
                 DOES_RETURN, ACTUAL, NOT_CGINTRINSIC, NOT_SLAVE, 
                 IRETURN_SZT, NULL, NULL, "dummy_name")
 

Modified: trunk/osprey/wgen/wgen_expr.cxx
===================================================================
--- trunk/osprey/wgen/wgen_expr.cxx     2010-12-09 19:17:22 UTC (rev 3427)
+++ trunk/osprey/wgen/wgen_expr.cxx     2010-12-09 19:43:00 UTC (rev 3428)
@@ -5726,7 +5726,7 @@
 Fold_Object_Size (WN* intrinsic_op) {
 
     Is_True (WN_operator (intrinsic_op) == OPR_INTRINSIC_OP && 
-             WN_intrinsic (intrinsic_op) ==  INTRN_OBJ_SZ,
+             WN_intrinsic (intrinsic_op) ==  INTRN_OBJECT_SIZE,
              ("Invalid intrisic op"));
     
     // the rtype should be the type corresponing to high level type size_t
@@ -9062,7 +9062,7 @@
                break;
        
              case GSBI_BUILT_IN_OBJECT_SIZE:
-               iopc = INTRN_OBJ_SZ;
+               iopc = INTRN_OBJECT_SIZE;
                intrinsic_op = TRUE;
                break;
                
@@ -9503,7 +9503,7 @@
                                      iopc, num_args, ikids);
             WN_Set_Deref_If_Needed(wn);
 
-        if (iopc == INTRN_OBJ_SZ) {
+        if (iopc == INTRN_OBJECT_SIZE) {
             // kludge to the undefined __builtin_object_size() problem (bug 
#586).  
             //
             wn = Fold_Object_Size (wn);


------------------------------------------------------------------------------
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel

Reply via email to