commit 8c6d9ff6f60b737d1e96c0dab0b4e67402bf3316
author Ian Lance Taylor <iant@golang.org> Sun Sep 10 10:04:27 2017 -0700
committer Ian Lance Taylor <iant@golang.org> Thu Sep 14 03:44:49 2017 +0000
tree 6e4b4d31c87fb545c58bc462bffcecafcc7557ea
parent 52ebad939927e6cbfb48dd277cef8db451e36533

compiler: fix check for notinheap conversion

A normal pointer may not be converted to a notinheap pointer.  We were
erroneously permitting a conversion from a normal pointer to a
notinheap unsafe.Pointer, which is useless since unsafe.Pointer is not
marked notinheap.  Correct the test to permit a conversion from
unsafe.Pointer to a notinheap pointer, which is the same test that the
gc compiler uses.

The test case for this is in the 1.9 runtime package.

Change-Id: Ie86db54020ed977068969d53fa67568c3cca8d23
Reviewed-on: https://go-review.googlesource.com/62731
Reviewed-by: Than McIntosh <thanm@google.com>

go/types.cc

diff --git a/go/types.cc b/go/types.cc
index cde1408..cdf1f40 100644
--- a/go/types.cc
+++ b/go/types.cc
@@ -747,16 +747,16 @@
     return true;
 
   // A pointer to a regular type may not be converted to a pointer to
-  // a type that may not live in the heap, except when converting to
+  // a type that may not live in the heap, except when converting from
   // unsafe.Pointer.
   if (lhs->points_to() != NULL
       && rhs->points_to() != NULL
-      && !rhs->points_to()->in_heap()
-      && lhs->points_to()->in_heap()
-      && !lhs->is_unsafe_pointer_type())
+      && !lhs->points_to()->in_heap()
+      && rhs->points_to()->in_heap()
+      && !rhs->is_unsafe_pointer_type())
     {
       if (reason != NULL)
-	reason->assign(_("conversion from notinheap type to normal type"));
+	reason->assign(_("conversion from normal type to notinheap type"));
       return false;
     }