aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2015-10-30 13:42:27 +0000
committerrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2015-10-30 13:42:27 +0000
commitd803eb54e8be28f7bac73b3887633e6b11c7fe8a (patch)
treeea61f6c5d9733c823fab8c6df2bdd0114bcbfe15
parentfd396523e0d294a34c639d11b557a66d0f33fdaa (diff)
Robustify REAL_MODE_FORMAT
Make sure that REAL_MODE_FORMAT aborts if it is passed an invalid mode, rather than stepping beyond the bounds of an array. It turned out that some code was passing non-float modes to the real.h routines. Tested on x86_64-linux-gnu, arm-linux-gnueabi and aarch64-linux-gnu. gcc/ * real.h (REAL_MODE_FORMAT): Abort if the mode isn't a SCALAR_FLOAT_MODE_P. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229579 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/real.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7178c5aeec3..26f9a375257 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-30 Richard Sandiford <richard.sandiford@arm.com>
+
+ * real.h (REAL_MODE_FORMAT): Abort if the mode isn't a
+ SCALAR_FLOAT_MODE_P.
+
2015-10-30 Alan Lawrence <alan.lawrence@arm.com>
* tree-sra.c (scalarizable_type_p): Comment variable-length arrays.
diff --git a/gcc/real.h b/gcc/real.h
index e65b5263e11..d3b14e5b4f8 100644
--- a/gcc/real.h
+++ b/gcc/real.h
@@ -167,7 +167,9 @@ extern const struct real_format *
(real_format_for_mode[DECIMAL_FLOAT_MODE_P (MODE) \
? (((MODE) - MIN_MODE_DECIMAL_FLOAT) \
+ (MAX_MODE_FLOAT - MIN_MODE_FLOAT + 1)) \
- : ((MODE) - MIN_MODE_FLOAT)])
+ : GET_MODE_CLASS (MODE) == MODE_FLOAT \
+ ? ((MODE) - MIN_MODE_FLOAT) \
+ : (gcc_unreachable (), 0)])
#define FLOAT_MODE_FORMAT(MODE) \
(REAL_MODE_FORMAT (SCALAR_FLOAT_MODE_P (MODE)? (MODE) \