aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2013-09-18 18:36:21 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2013-09-18 18:36:21 +0000
commit17836103ae7e112139d5e5d7e3acd7e681b59f4f (patch)
treee212e72ba8bf8210864062dd279d7ce2c33dbc44 /gcc
parentb4efa80e568555f4ef2ec3a6b9ae82c530242e69 (diff)
downloadgcc-17836103ae7e112139d5e5d7e3acd7e681b59f4f.zip
gcc-17836103ae7e112139d5e5d7e3acd7e681b59f4f.tar.gz
gcc-17836103ae7e112139d5e5d7e3acd7e681b59f4f.tar.bz2
compiler: Fix type of result of shortcut calculation.
From-SVN: r202717
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/gogo.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index be8ec59..17cbb6b 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -2367,7 +2367,7 @@ Shortcuts::convert_shortcut(Block* enclosing, Expression** pshortcut)
Block* retblock = new Block(enclosing, loc);
retblock->set_end_location(loc);
- Temporary_statement* ts = Statement::make_temporary(Type::lookup_bool_type(),
+ Temporary_statement* ts = Statement::make_temporary(shortcut->type(),
left, loc);
retblock->add_statement(ts);