diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f23eef8..dee5f67 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -821960465883fbdd96568f2325f55ee4b05de1cb +262d629b1592f681fef396166a671e46cdb31230 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index 10ab5b5..109d6b4 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -8224,6 +8224,11 @@ Builtin_call_expression::do_numeric_constant_value(Numeric_constant* nc) const return false; if (st->named_type() != NULL) st->named_type()->convert(this->gogo_); + if (st->is_error_type()) + { + go_assert(saw_errors()); + return false; + } int64_t offset; this->seen_ = true; bool ok = st->struct_type()->backend_field_offset(this->gogo_, |