[llvm-commits] CVS: llvm-gcc/gcc/c-typeck.c

[Chris Lattner]

Changes in directory llvm-gcc/gcc:

c-typeck.c updated: 1.8 -> 1.9
---
Log message:

Work around a bug in fold_convert that causes it to return types instead of
expressions in some cases.  This fixes Regression/CFrontend/2005-03-06-OffsetOfStructCrash.c
and the Applications/d regression last night from the patch for PR533: http://llvm.cs.uiuc.edu/PR533 


---
Diffs of the changes:  (+1 -1)

 c-typeck.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-gcc/gcc/c-typeck.c
diff -u llvm-gcc/gcc/c-typeck.c:1.8 llvm-gcc/gcc/c-typeck.c:1.9
--- llvm-gcc/gcc/c-typeck.c:1.8	Sat Mar  5 12:49:59 2005
+++ llvm-gcc/gcc/c-typeck.c	Sun Mar  6 13:42:06 2005
@@ -2453,7 +2453,7 @@
       val = get_base_address (arg);
       if (val && TREE_CODE (val) == INDIRECT_REF
           && integer_zerop (TREE_OPERAND (val, 0)))
-        return fold_convert (argtype, fold_offsetof (arg));
+        return fold(convert(argtype, fold_offsetof(arg)));