diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-02 01:51:02 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-02 01:51:02 +0000 |
| commit | 9c8115261fa03f2eda5a9bfb7cb37ed4f86c4d4e (patch) | |
| tree | b5e3688be247ecd147e1cdef28cb5a5f40a44b8f /gcc/fold-const.c | |
| parent | d096c64aec8cd7505c0b3b879c20eb41b13ac3da (diff) | |
| download | gcc-9c8115261fa03f2eda5a9bfb7cb37ed4f86c4d4e.tar.gz | |
* config/xm-lynx.h, config/xm-std32.h, config/a29k/xm-a29k.h,
config/a29k/xm-unix.h, config/alpha/xm-alpha.h,
config/arc/xm-arc.h, config/arm/xm-arm.h, config/c4x/xm-c4x.h,
config/clipper/xm-clix.h, config/convex/xm-convex.h,
config/d30v/xm-d30v.h, config/dsp16xx/xm-dsp16xx.h,
config/elxsi/xm-elxsi.h, config/fr30/xm-fr30.h,
config/h8300/xm-h8300.h, config/i370/xm-i370.h,
config/i370/xm-linux.h, config/i370/xm-mvs.h,
config/i370/xm-oe.h, config/i386/xm-aix.h,
config/i386/xm-i386.h, config/i386/xm-osf.h,
config/i860/xm-i860.h, config/i960/xm-i960.h,
config/ia64/xm-ia64.h, config/m32r/xm-m32r.h,
config/m68k/xm-m68k.h, config/m88k/xm-m88k.h,
config/mcore/xm-mcore.h, config/mips/xm-mips.h,
config/mn10200/xm-mn10200.h, config/mn10300/xm-mn10300.h,
config/ns32k/xm-ns32k.h, config/pa/xm-linux.h,
config/pa/xm-pa.h, config/pa/xm-pa64hpux.h,
config/pa/xm-pahpux.h, config/pa/xm-papro.h,
config/pj/xm-pj.h, config/romp/xm-romp.h,
config/rs6000/xm-beos.h, config/rs6000/xm-rs6000.h,
config/rs6000/xm-sysv4.h, config/sh/xm-sh.h,
config/sparc/xm-sparc.h, config/sparc/xm-sysv4.h,
config/v850/xm-v850.h, config/vax/xm-vax.h,
config/vax/xm-vms.h, config/we32k/xm-we32k.h:
Do not define TRUE or FALSE.
* config/i386/xm-aix.h, config/i386/xm-osf.h: Delete; made
empty by above change.
* config.gcc: Remove references to these files.
* configure.in: Detect stdbool.h.
* configure, config.in: Regenerate.
* system.h: Include stddef.h here if available. Set
HAVE__BOOL based on GCC_VERSION and __STDC_VERSION__. Then
set up a sensible boolean type at the very end.
* combine.c, cse.c, expr.c, fold-const.c, gensupport.c,
f/com.c, config/mcore/mcore.c:
Rename variables named 'true' and/or 'false'.
* hash.h: Delete 'boolean' typedef and related #undefs.
* f/proj.h: Delete 'bool' type. Don't include stddef.h here.
* function.c, ggc-common.c, hash.h, hash.c, tlink.c, cp/decl.c,
java/class.c, java/decl.c, java/java-tree.h:
Replace all uses of 'boolean' with 'bool'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40176 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fold-const.c')
| -rw-r--r-- | gcc/fold-const.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 69b99206802..e7cee978bfe 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -4695,16 +4695,16 @@ count_cond (expr, lim) tree expr; int lim; { - int true, false; + int ctrue, cfalse; if (TREE_CODE (expr) != COND_EXPR) return 0; else if (lim <= 0) return 0; - true = count_cond (TREE_OPERAND (expr, 1), lim - 1); - false = count_cond (TREE_OPERAND (expr, 2), lim - 1 - true); - return MIN (lim, 1 + true + false); + ctrue = count_cond (TREE_OPERAND (expr, 1), lim - 1); + cfalse = count_cond (TREE_OPERAND (expr, 2), lim - 1 - ctrue); + return MIN (lim, 1 + ctrue + cfalse); } /* Transform `a + (b ? x : y)' into `x ? (a + b) : (a + y)'. |