aboutsummaryrefslogtreecommitdiff
path: root/gcc/go/go-gcc.cc
diff options
context:
space:
mode:
authorThan McIntosh <thanm@google.com>2017-01-11 18:15:16 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-11 18:15:16 +0000
commita2182c9cc2a1d887457e38d13e63598f85443020 (patch)
tree01781f4b52d85c765576949475a9459eba3e295c /gcc/go/go-gcc.cc
parent1f258a55a9df39ecef35d0049c3bf703d6cdbe53 (diff)
downloadgcc-a2182c9cc2a1d887457e38d13e63598f85443020.zip
gcc-a2182c9cc2a1d887457e38d13e63598f85443020.tar.gz
gcc-a2182c9cc2a1d887457e38d13e63598f85443020.tar.bz2
compiler: add containing Bfunction to conditional_expression
Add containing Bfunction to Backend::conditional_expression method signature, since the back end might need to create a temporary when generating IR for this construct. Reviewed-on: https://go-review.googlesource.com/35056 From-SVN: r244330
Diffstat (limited to 'gcc/go/go-gcc.cc')
-rw-r--r--gcc/go/go-gcc.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 58312e4..ed6fc2c 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -325,8 +325,8 @@ class Gcc_backend : public Backend
compound_expression(Bstatement*, Bexpression*, Location);
Bexpression*
- conditional_expression(Btype*, Bexpression*, Bexpression*, Bexpression*,
- Location);
+ conditional_expression(Bfunction*, Btype*, Bexpression*, Bexpression*,
+ Bexpression*, Location);
Bexpression*
unary_expression(Operator, Bexpression*, Location);
@@ -1546,7 +1546,8 @@ Gcc_backend::compound_expression(Bstatement* bstat, Bexpression* bexpr,
// ELSE_EXPR otherwise.
Bexpression*
-Gcc_backend::conditional_expression(Btype* btype, Bexpression* condition,
+Gcc_backend::conditional_expression(Bfunction*, Btype* btype,
+ Bexpression* condition,
Bexpression* then_expr,
Bexpression* else_expr, Location location)
{