From 17836103ae7e112139d5e5d7e3acd7e681b59f4f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 18 Sep 2013 18:36:21 +0000 Subject: [PATCH] compiler: Fix type of result of shortcut calculation. From-SVN: r202717 --- gcc/go/gofrontend/gogo.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc index be8ec5939f3..17cbb6b9b49 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); -- 2.30.2