From: Nathan Sidwell <nathan@gcc.gnu.org>
Date: Tue, 17 Aug 2004 15:42:55 +0000 (+0000)
Subject: objc-act.c (build_protocol_initializer): Fix build_int_cst usage.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e15987c1164b77494bc07dc92d48a37a8ec61168;p=gcc.git

objc-act.c (build_protocol_initializer): Fix build_int_cst usage.

	* objc/objc-act.c (build_protocol_initializer): Fix build_int_cst
	usage.
	(generate_protocol_list, handle_impent): Likewise.

From-SVN: r86129
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 055fc374808..dd4cf89d3fc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* objc/objc-act.c (build_protocol_initializer): Fix build_int_cst
+	usage.
+	(generate_protocol_list, handle_impent): Likewise.
+
 2004-08-17  Roger Sayle  <roger@eyesopen.com>
 
 	* regclass.c (init_reg_sets_1): Add ENABLE_CHECKING sanity tests to
@@ -1829,7 +1835,7 @@
 	* config/i386/xmmintrin.h: Include <mm_malloc.h>.
 
 2004-08-03  H.J. Lu  <hongjiu.lu@intel.com>
-	    Tanguy Fautrà <tfautre@pandora.be>
+	    Tanguy Fautrà <tfautre@pandora.be>
 
 	* config/i386/pmm_malloc.h: New file.
 
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index a97ca68d50f..cab25f407f3 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -3912,8 +3912,7 @@ build_protocol_initializer (tree type, tree protocol_name,
   /* Filling the "isa" in with one allows the runtime system to
      detect that the version change...should remove before final release.  */
 
-  expr = build_int_cst (NULL_TREE, PROTOCOL_VERSION, 0);
-  TREE_TYPE (expr) = cast_type;
+  expr = build_int_cst (cast_type, PROTOCOL_VERSION, 0);
   initlist = tree_cons (NULL_TREE, expr, initlist);
   initlist = tree_cons (NULL_TREE, protocol_name, initlist);
   initlist = tree_cons (NULL_TREE, protocol_list, initlist);
@@ -4848,8 +4847,7 @@ generate_protocol_list (tree i_or_p)
   /* Build initializer.  */
   initlist = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, 0, 0), NULL_TREE);
 
-  e = build_int_cst (NULL_TREE, size, 0);
-  TREE_TYPE (e) = cast_type;
+  e = build_int_cst (cast_type, size, 0);
   initlist = tree_cons (NULL_TREE, e, initlist);
 
   for (lproto = plist; lproto; lproto = TREE_CHAIN (lproto))
@@ -9019,8 +9017,7 @@ handle_impent (struct imp_entry *impent)
     {
       tree decl, init;
 
-      init = build_int_cst (NULL_TREE, 0, 0);
-      TREE_TYPE (init) = c_common_type_for_size (BITS_PER_WORD, 1);
+      init = build_int_cst (c_common_type_for_size (BITS_PER_WORD, 1), 0, 0);
       decl = build_decl (VAR_DECL, get_identifier (string), TREE_TYPE (init));
       TREE_PUBLIC (decl) = 1;
       TREE_READONLY (decl) = 1;