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

re PR c++/13371 (infinite loop with packed struct and inlining)

Browse Source 
PR c++/13371
        * typeck.c (build_modify_expr): Stabilize lhs if we're narrowing.

From-SVN: r74846
This commit is contained in:
Jason Merrill 2003-12-19 15:25:22 -05:00 committed by Jason Merrill
parent a0687c1fbc
commit 60cd3e8bab
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-19 Jason Merrill <jason@redhat.com>
PR c++/13371
* typeck.c (build_modify_expr): Stabilize lhs if we're narrowing.
2003-12-18 Richard Henderson <rth@redhat.com>
* cp-tree.h (struct lang_type_header): Remove __extension__.

16
gcc/cp/typeck.c
View File

@ -4919,7 +4919,7 @@ build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs)
tree newrhs = rhs;
tree lhstype = TREE_TYPE (lhs);
tree olhstype = lhstype;
tree olhs = lhs;
tree olhs = NULL_TREE;
/* Avoid duplicate error messages from operands that had errors. */
if (lhs == error_mark_node || rhs == error_mark_node)
@ -5149,6 +5149,15 @@ build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs)
if (lhstype != TREE_TYPE (lhs))
{
/* Avoid warnings converting integral types back into enums for
enum bit fields. */
if (TREE_CODE (lhstype) == INTEGER_TYPE
&& TREE_CODE (olhstype) == ENUMERAL_TYPE)
{
if (TREE_SIDE_EFFECTS (lhs))
lhs = stabilize_reference (lhs);
olhs = lhs;
}
lhs = copy_node (lhs);
TREE_TYPE (lhs) = lhstype;
}
@ -5221,10 +5230,7 @@ build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs)
if (olhstype == TREE_TYPE (result))
return result;
/* Avoid warnings converting integral types back into enums
for enum bit fields. */
if (TREE_CODE (TREE_TYPE (result)) == INTEGER_TYPE
&& TREE_CODE (olhstype) == ENUMERAL_TYPE)
if (olhs)
{
result = build (COMPOUND_EXPR, olhstype, result, olhs);
TREE_NO_UNUSED_WARNING (result) = 1;

33
gcc/testsuite/g++.dg/init/bitfield2.C Normal file
View File

@ -0,0 +1,33 @@
// PR c++/13371
// Bug: We were failing to properly protect the lhs on the line marked
// "here" from multiple evaluation.
// { dg-do run }
extern "C" int printf (const char *, ...);
enum E { E1, E2 };
struct A
{
E e : 8;
unsigned char c;
};
A ar[2];
int c;
int f()
{
++c;
printf ("f()\n");
return 0;
}
int main()
{
ar[0].c = 0xff;
ar[f()].e = E1; // here
return (c != 1 || ar[0].c != 0xff);
}