diff options
| author | Ian Bolton <ian.bolton@arm.com> | 2010-08-19 08:12:31 +0000 |
|---|---|---|
| committer | Ramana Radhakrishnan <ramana@gcc.gnu.org> | 2010-08-19 08:12:31 +0000 |
| commit | f096c02afcfad5fbb2e0021af89520c3745084e5 (patch) | |
| tree | cb8efc3d295c482a1090305d96edf16eb06c7b35 /gcc | |
| parent | d76799c7f0a13ab5a02487f2e6d4dfe10156b223 (diff) | |
| download | gcc-f096c02afcfad5fbb2e0021af89520c3745084e5.zip gcc-f096c02afcfad5fbb2e0021af89520c3745084e5.tar.gz gcc-f096c02afcfad5fbb2e0021af89520c3745084e5.tar.bz2 | |
For Ian Bolton <ian.bolton@arm.com>
* tree-switch-conversion.c (gen_inbound_check): Ensure that the
type for the conditional has wide enough range.
* testsuite/g++.dg/pr44328.C: New test.
From-SVN: r163366
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/pr44328.C | 39 | ||||
| -rw-r--r-- | gcc/tree-switch-conversion.c | 7 |
4 files changed, 53 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f7e5e33..4711095 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-08-19 Ian Bolton <ian.bolton@arm.com> + + * tree-switch-conversion.c (gen_inbound_check): Ensure that the + type for the conditional has wide enough range. + 2010-08-18 Uros Bizjak <ubizjak@gmail.com> PR target/45327 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index db26a97..afd8b99 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2010-08-19 Ian Bolton <ian.bolton@arm.com> + + * g++.dg/pr44328.C: New test. + 2010-08-19 Tobias Burnus <burnus@net-b.de> PR fortran/36158 diff --git a/gcc/testsuite/g++.dg/pr44328.C b/gcc/testsuite/g++.dg/pr44328.C new file mode 100644 index 0000000..bbfe233 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr44328.C @@ -0,0 +1,39 @@ +/* { dg-do compile } */ +/* { dg-options "-c -O2 -Wextra" } */ +#define O_RDONLY (1<<0) +#define O_WRONLY (1<<1) +#define O_RDWR (O_RDONLY|O_WRONLY) +#define O_CREAT (1<<3) +#define O_TRUNC (1<<6) + +typedef enum { + OM_READ = 0, + OM_WRITE, + OM_READWRITE_NOCREATE, + OM_READWRITE_CREATE +} OpenMode; + +extern int open(const char *name, int mode); + +void open_file(const char *filename, const OpenMode rw) +{ + int mode = 0; + + switch( rw ) + { + case OM_WRITE: + mode = O_WRONLY|O_CREAT|O_TRUNC; + break; + case OM_READ: + mode = O_RDONLY; + break; + case OM_READWRITE_NOCREATE: + mode = O_RDWR; + break; + case OM_READWRITE_CREATE: + mode = O_RDWR|O_CREAT|O_TRUNC; + break; + } + + open( filename, mode ); +} diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index ed8b5ce..7072af8 100644 --- a/gcc/tree-switch-conversion.c +++ b/gcc/tree-switch-conversion.c @@ -96,6 +96,7 @@ eight) times the number of the actual switch branches. */ #include "gimple-pretty-print.h" #include "tree-dump.h" #include "timevar.h" +#include "langhooks.h" /* The main structure of the pass. */ struct switch_conv_info @@ -694,9 +695,11 @@ gen_inbound_check (gimple swtch) /* Make sure we do not generate arithmetics in a subrange. */ if (TREE_TYPE (TREE_TYPE (info.index_expr))) - utype = unsigned_type_for (TREE_TYPE (TREE_TYPE (info.index_expr))); + utype = lang_hooks.types.type_for_mode + (TYPE_MODE (TREE_TYPE (TREE_TYPE (info.index_expr))), 1); else - utype = unsigned_type_for (TREE_TYPE (info.index_expr)); + utype = lang_hooks.types.type_for_mode + (TYPE_MODE (TREE_TYPE (info.index_expr)), 1); /* (end of) block 0 */ gsi = gsi_for_stmt (info.arr_ref_first); |