diff options
| author | Ian Lance Taylor <iant@google.com> | 2015-01-15 00:27:56 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-01-15 00:27:56 +0000 |
| commit | f8d9fa9e80b57f89e7877ce6cad8a3464879009b (patch) | |
| tree | 58a1724fee16d2b03c65678c4dd9b50bb97137a9 /gcc/go | |
| parent | 6bd3f109d8d8fa58eeccd6b3504721b4f20c00c2 (diff) | |
| download | gcc-f8d9fa9e80b57f89e7877ce6cad8a3464879009b.zip gcc-f8d9fa9e80b57f89e7877ce6cad8a3464879009b.tar.gz gcc-f8d9fa9e80b57f89e7877ce6cad8a3464879009b.tar.bz2 | |
libgo, compiler: Upgrade libgo to Go 1.4, except for runtime.
This upgrades all of libgo other than the runtime package to
the Go 1.4 release. In Go 1.4 much of the runtime was
rewritten into Go. Merging that code will take more time and
will not change the API, so I'm putting it off for now.
There are a few runtime changes anyhow, to accomodate other
packages that rely on minor modifications to the runtime
support.
The compiler changes slightly to add a one-bit flag to each
type descriptor kind that is stored directly in an interface,
which for gccgo is currently only pointer types. Another
one-bit flag (gcprog) is reserved because it is used by the gc
compiler, but gccgo does not currently use it.
There is another error check in the compiler since I ran
across it during testing.
gotools/:
* Makefile.am (go_cmd_go_files): Sort entries. Add generate.go.
* Makefile.in: Rebuild.
From-SVN: r219627
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.cc | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/types.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index 323ce16..564c5b7 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -15559,7 +15559,7 @@ bool Numeric_constant::set_type(Type* type, bool issue_error, Location loc) { bool ret; - if (type == NULL) + if (type == NULL || type->is_error()) ret = true; else if (type->integer_type() != NULL) ret = this->check_int_type(type->integer_type(), issue_error, loc); diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index f9877fa..d304757 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -1966,6 +1966,8 @@ Type::type_descriptor_constructor(Gogo* gogo, int runtime_type_kind, if (!this->has_pointer()) runtime_type_kind |= RUNTIME_TYPE_KIND_NO_POINTERS; + if (this->points_to() != NULL) + runtime_type_kind |= RUNTIME_TYPE_KIND_DIRECT_IFACE; Struct_field_list::const_iterator p = fields->begin(); go_assert(p->is_field_name("kind")); vals->push_back(Expression::make_integer_ul(runtime_type_kind, p->type(), diff --git a/gcc/go/gofrontend/types.h b/gcc/go/gofrontend/types.h index 4f000b1..acc8af5 100644 --- a/gcc/go/gofrontend/types.h +++ b/gcc/go/gofrontend/types.h @@ -81,6 +81,8 @@ static const int RUNTIME_TYPE_KIND_STRING = 24; static const int RUNTIME_TYPE_KIND_STRUCT = 25; static const int RUNTIME_TYPE_KIND_UNSAFE_POINTER = 26; +static const int RUNTIME_TYPE_KIND_DIRECT_IFACE = (1 << 5); +static const int RUNTIME_TYPE_KIND_GC_PROG = (1 << 6); static const int RUNTIME_TYPE_KIND_NO_POINTERS = (1 << 7); // GC instruction opcodes. These must match the values in libgo/runtime/mgc0.h. |