Go patch committed: Use correct value in 2-case select send

Message ID CAOyqgcUMqD1UbWV1bex0EK1YzHOtBE15Qj2UJ30eTL_B-Jt_qA@mail.gmail.com
State New
Headers show
Series
  • Go patch committed: Use correct value in 2-case select send
Related show

Commit Message

Ian Lance Taylor July 23, 2019, 5:20 p.m.
This Go frontend patch by Cherry Zhang fixes the 2-case select send.
In the channel-send case, the value to be sent may needs an (implicit)
type conversion to the channel element type.  This patch ensures that
we use the correct value type for the send.  This fixes
https://golang.org/issue/33235.  Bootstrapped and ran Go testsuite on
x86_64-pc-linux-gnu.  Committed to mainline.

Ian

Patch

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 273713)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@ 
-b7bce0dbccb978d33eb8ce0bffc02fae2c2857c1
+480477ca64c3001b9c7e92ef8b978dc92a5912d2
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: gcc/go/gofrontend/statements.cc
===================================================================
--- gcc/go/gofrontend/statements.cc	(revision 273577)
+++ gcc/go/gofrontend/statements.cc	(working copy)
@@ -5880,6 +5880,7 @@  Select_statement::lower_two_case(Block*
      : this->clauses_->at(1));
   Location loc = this->location();
   Expression* chan = chancase.channel();
+  Type* valtype = chan->type()->channel_type()->element_type();
 
   Temporary_statement* chantmp = Statement::make_temporary(NULL, chan, loc);
   b->add_statement(chantmp);
@@ -5891,7 +5892,8 @@  Select_statement::lower_two_case(Block*
     {
       // if selectnbsend(chan, &val) { body } else { default body }
 
-      Temporary_statement* ts = Statement::make_temporary(NULL, chancase.val(), loc);
+      Temporary_statement* ts =
+        Statement::make_temporary(valtype, chancase.val(), loc);
       // Tell the escape analysis that the value escapes, as it may be sent
       // to a channel.
       ts->set_value_escapes();
@@ -5904,7 +5906,6 @@  Select_statement::lower_two_case(Block*
     }
   else
     {
-      Type* valtype = chan->type()->channel_type()->element_type();
       Temporary_statement* ts = Statement::make_temporary(valtype, NULL, loc);
       b->add_statement(ts);