OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

integrate.c (compare_blocks): Make comparisons safe for when sizeof(int) < sizeof(char *). 

* integrate.c (compare_blocks): Make comparisons safe for when
sizeof(int) < sizeof(char *).
(find_block): Likewise.

From-SVN: r52235
This commit is contained in:
DJ Delorie 2002-04-12 15:17:54 -04:00 committed by DJ Delorie
parent cf8a1ae612
commit 681843aa43
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-12 DJ Delorie <dj@redhat.com>
* integrate.c (compare_blocks): Make comparisons safe for when
sizeof(int) < sizeof(char *).
(find_block): Likewise.
2002-04-12 Andreas Schwab <schwab@suse.de>
* config/ia64/ia64.h (ASM_SPEC): Moved from here ...

16
gcc/integrate.c
View File

@ -595,7 +595,8 @@ process_reg_param (map, loc, copy)
}
/* Compare two BLOCKs for qsort. The key we sort on is the
BLOCK_ABSTRACT_ORIGIN of the blocks. */
BLOCK_ABSTRACT_ORIGIN of the blocks. We cannot just subtract the
two pointers, because it may overflow sizeof(int). */
static int
compare_blocks (v1, v2)
@ -604,9 +605,12 @@ compare_blocks (v1, v2)
{
tree b1 = *((const tree *) v1);
tree b2 = *((const tree *) v2);
char *p1 = (char *) BLOCK_ABSTRACT_ORIGIN (b1);
char *p2 = (char *) BLOCK_ABSTRACT_ORIGIN (b2);
return ((char *) BLOCK_ABSTRACT_ORIGIN (b1)
- (char *) BLOCK_ABSTRACT_ORIGIN (b2));
if (p1 == p2)
return 0;
return p1 < p2 ? -1 : 1;
}
/* Compare two BLOCKs for bsearch. The first pointer corresponds to
@ -619,8 +623,12 @@ find_block (v1, v2)
{
const union tree_node *b1 = (const union tree_node *) v1;
tree b2 = *((const tree *) v2);
char *p1 = (char *) b1;
char *p2 = (char *) BLOCK_ABSTRACT_ORIGIN (b2);
return ((const char *) b1 - (char *) BLOCK_ABSTRACT_ORIGIN (b2));
if (p1 == p2)
return 0;
return p1 < p2 ? -1 : 1;
}
/* Integrate the procedure defined by FNDECL. Note that this function