compiler, go/internal/gccgoimporter: export notinheap annotation
This is the gofrontend version of https://golang.org/cl/259297.
This is required now because that change is in the 1.15.3 release.
This requires changing the go/internal/gccgoimporter package, to skip
the new annotation. This change will need to be ported to the gc and
x/tools repos.
For golang/go#41761
Change-Id: I81d63db7e7c41d168dfa5f1539c063c1c2413568
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/265258
Trust: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/go/export.cc b/go/export.cc
index 277aa74..90a5f6d 100644
--- a/go/export.cc
+++ b/go/export.cc
@@ -1211,6 +1211,9 @@
this->write_string(nt->named_object()->name());
this->write_c_string("\" ");
+ if (!nt->in_heap())
+ this->write_c_string("notinheap ");
+
if (nt->is_alias())
this->write_c_string("= ");
}
diff --git a/go/import.cc b/go/import.cc
index c6c1178..f671416 100644
--- a/go/import.cc
+++ b/go/import.cc
@@ -1049,6 +1049,13 @@
this->require_c_string(" ");
}
+ bool in_heap = true;
+ if (this->match_c_string("notinheap"))
+ {
+ this->require_c_string("notinheap ");
+ in_heap = false;
+ }
+
bool is_alias = false;
if (this->match_c_string("= "))
{
@@ -1102,7 +1109,14 @@
// declaration of a type defined in some other file.
Type* type;
if (this->match_c_string(">") || this->match_c_string("\n"))
- type = this->types_[index];
+ {
+ type = this->types_[index];
+ if (!in_heap)
+ go_error_at(this->location_,
+ ("import error at %d for type index %d: "
+ "forward declaration marked notinheap"),
+ this->pos(), index);
+ }
else
{
if (no->is_type_declaration())
@@ -1117,6 +1131,8 @@
// This type has not yet been imported.
ntype->clear_is_visible();
+ if (!in_heap)
+ ntype->set_not_in_heap();
if (is_alias)
ntype->set_is_alias();
diff --git a/go/types.cc b/go/types.cc
index eb9c766..f3bcf2e 100644
--- a/go/types.cc
+++ b/go/types.cc
@@ -6048,7 +6048,7 @@
// Return whether this struct type is permitted to be in the heap.
bool
-Struct_type::do_in_heap()
+Struct_type::do_in_heap() const
{
const Struct_field_list* fields = this->fields_;
if (fields == NULL)
diff --git a/go/types.h b/go/types.h
index ccd1268..9ac8516 100644
--- a/go/types.h
+++ b/go/types.h
@@ -667,7 +667,7 @@
// Whether the type is permitted in the heap.
bool
- in_heap()
+ in_heap() const
{ return this->do_in_heap(); }
// Return a hash code for this type for the method hash table.
@@ -1120,7 +1120,7 @@
{ return false; }
virtual bool
- do_in_heap()
+ do_in_heap() const
{ return true; }
virtual unsigned int
@@ -2660,7 +2660,7 @@
do_hash_might_panic();
bool
- do_in_heap();
+ do_in_heap() const;
unsigned int
do_hash_for_method(Gogo*, int) const;
@@ -2842,7 +2842,7 @@
{ return this->length_ != NULL && this->element_type_->hash_might_panic(); }
bool
- do_in_heap()
+ do_in_heap() const
{ return this->length_ == NULL || this->element_type_->in_heap(); }
unsigned int
@@ -3591,7 +3591,7 @@
do_needs_key_update();
bool
- do_in_heap()
+ do_in_heap() const
{ return this->in_heap_ && this->type_->in_heap(); }
unsigned int
@@ -3754,7 +3754,7 @@
{ return this->real_type()->needs_key_update(); }
bool
- do_in_heap()
+ do_in_heap() const
{ return this->real_type()->in_heap(); }
unsigned int
diff --git a/libgo/go/go/internal/gccgoimporter/parser.go b/libgo/go/go/internal/gccgoimporter/parser.go
index e2ef33f..1b1d07d 100644
--- a/libgo/go/go/internal/gccgoimporter/parser.go
+++ b/libgo/go/go/internal/gccgoimporter/parser.go
@@ -517,6 +517,13 @@
p.errorf("%v has nil type", obj)
}
+ if p.tok == scanner.Ident && p.lit == "notinheap" {
+ p.next()
+ // The go/types package has no way of recording that
+ // this type is marked notinheap. Presumably no user
+ // of this package actually cares.
+ }
+
// type alias
if p.tok == '=' {
p.next()
