summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorsteven <steven@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-10 13:42:46 +0000
committersteven <steven@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-10 13:42:46 +0000
commit5f2f65e659c1d4bdb5c7b15701eceeaa6a3d1f8f (patch)
tree5e5facbcd5c5ff21d8ee10d786a8fe31926dd21c /gcc/fortran
parent3bbe8a1c6814c34fbf73301cc6641e1120816cbc (diff)
downloadgcc-5f2f65e659c1d4bdb5c7b15701eceeaa6a3d1f8f.tar.gz
* convert.c (convert): Fold BOOLEAN_TYPE types to the proper variant.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185174 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/convert.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1683a10cdda..2da6551b608 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-10 Steven Bosscher <steven@gcc.gnu.org>
+
+ * convert.c (convert): Fold BOOLEAN_TYPE types to the proper variant.
+
2012-03-09 Steven Bosscher <steven@gcc.gnu.org>
* Make-lang.in (convert.o): Depend on convert.h.
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index 52476adbb52..639f6c4864d 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -95,7 +95,8 @@ convert (tree type, tree expr)
if (code == VOID_TYPE)
return fold_build1_loc (input_location, CONVERT_EXPR, type, e);
if (code == BOOLEAN_TYPE)
- return truthvalue_conversion (e);
+ return fold_build1_loc (input_location, NOP_EXPR, type,
+ truthvalue_conversion (e));
if (code == INTEGER_TYPE)
return fold (convert_to_integer (type, e));
if (code == POINTER_TYPE || code == REFERENCE_TYPE)