This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Go patch committed: Better errors for invalid [...]type
- From: Ian Lance Taylor <iant at google dot com>
- To: gcc-patches at gcc dot gnu dot org, gofrontend-dev at googlegroups dot com
- Date: Fri, 16 Sep 2011 17:11:33 -0700
- Subject: Go patch committed: Better errors for invalid [...]type
This patch to the Go frontend improves the error handling for invalid
use of [...]type, which may be only used with a composite literal.
Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu.
Committed to mainline.
Ian
Index: gcc/go/gofrontend/parse.cc
===================================================================
--- gcc/go/gofrontend/parse.cc (revision 178784)
+++ gcc/go/gofrontend/parse.cc (working copy)
@@ -2761,8 +2761,21 @@ Parse::primary_expr(bool may_be_sink, bo
else
this->advance_token();
if (expr->is_error_expression())
- return expr;
- ret = Expression::make_cast(ret->type(), expr, loc);
+ ret = expr;
+ else
+ {
+ Type* t = ret->type();
+ if (t->classification() == Type::TYPE_ARRAY
+ && t->array_type()->length() != NULL
+ && t->array_type()->length()->is_nil_expression())
+ {
+ error_at(ret->location(),
+ "invalid use of %<...%> in type conversion");
+ ret = Expression::make_error(loc);
+ }
+ else
+ ret = Expression::make_cast(t, expr, loc);
+ }
}
}
Index: gcc/go/gofrontend/expressions.cc
===================================================================
--- gcc/go/gofrontend/expressions.cc (revision 178870)
+++ gcc/go/gofrontend/expressions.cc (working copy)
@@ -11789,7 +11789,7 @@ Array_construction_expression::do_check_
}
Expression* length = at->length();
- if (length != NULL)
+ if (length != NULL && !length->is_error_expression())
{
mpz_t val;
mpz_init(val);
Index: gcc/testsuite/go.test/test/ddd1.go
===================================================================
--- gcc/testsuite/go.test/test/ddd1.go (revision 178784)
+++ gcc/testsuite/go.test/test/ddd1.go (working copy)
@@ -15,7 +15,7 @@ var (
_ = sum()
_ = sum(1.0, 2.0)
_ = sum(1.5) // ERROR "integer"
- _ = sum("hello") // ERROR "convert|incompatible"
+ _ = sum("hello") // ERROR "string.*as type int|incompatible"
_ = sum([]int{1}) // ERROR "slice literal.*as type int|incompatible"
)
@@ -43,4 +43,7 @@ func bad(args ...int) {
var x int
_ = unsafe.Pointer(&x...) // ERROR "[.][.][.]"
_ = unsafe.Sizeof(x...) // ERROR "[.][.][.]"
+ _ = [...]byte("foo") // ERROR "[.][.][.]"
+ _ = [...][...]int{{1,2,3},{4,5,6}} // ERROR "[.][.][.]"
}
+