This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Go patch committed: Don't crash on index into erroneous map
- 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: Wed, 22 Dec 2010 15:24:33 -0800
- Subject: Go patch committed: Don't crash on index into erroneous map
This patch to the Go frontend avoids a crash when indexing into an
erroneous map. Bootstrapped and ran Go testsuite on
x86_64-unknown-linux-gnu. Committed to mainline.
Ian
diff -r 1fd3326a792f go/expressions.cc
--- a/go/expressions.cc Wed Dec 22 15:08:11 2010 -0800
+++ b/go/expressions.cc Wed Dec 22 15:20:36 2010 -0800
@@ -9630,7 +9630,8 @@
Map_index_expression::get_map_type() const
{
Map_type* mt = this->map_->type()->deref()->map_type();
- gcc_assert(mt != NULL);
+ if (mt == NULL)
+ gcc_assert(saw_errors());
return mt;
}
@@ -9649,7 +9650,10 @@
Type*
Map_index_expression::do_type()
{
- Type* type = this->get_map_type()->val_type();
+ Map_type* mt = this->get_map_type();
+ if (mt == NULL)
+ return Type::make_error_type();
+ Type* type = mt->val_type();
// If this map index is in a tuple assignment, we actually return a
// pointer to the value type. Tuple_map_assignment_statement is
// responsible for handling this correctly. We need to get the type
@@ -9665,7 +9669,9 @@
Map_index_expression::do_determine_type(const Type_context*)
{
this->map_->determine_type_no_context();
- Type_context subcontext(this->get_map_type()->key_type(), false);
+ Map_type* mt = this->get_map_type();
+ Type* key_type = mt == NULL ? NULL : mt->key_type();
+ Type_context subcontext(key_type, false);
this->index_->determine_type(&subcontext);
}
@@ -9675,8 +9681,10 @@
Map_index_expression::do_check_types(Gogo*)
{
std::string reason;
- if (!Type::are_assignable(this->get_map_type()->key_type(),
- this->index_->type(), &reason))
+ Map_type* mt = this->get_map_type();
+ if (mt == NULL)
+ return;
+ if (!Type::are_assignable(mt->key_type(), this->index_->type(), &reason))
{
if (reason.empty())
this->report_error(_("incompatible type for map index"));
@@ -9695,6 +9703,8 @@
Map_index_expression::do_get_tree(Translate_context* context)
{
Map_type* type = this->get_map_type();
+ if (type == NULL)
+ return error_mark_node;
tree valptr = this->get_value_pointer(context, this->is_lvalue_);
if (valptr == error_mark_node)
@@ -9732,6 +9742,8 @@
bool insert)
{
Map_type* type = this->get_map_type();
+ if (type == NULL)
+ return error_mark_node;
tree map_tree = this->map_->get_tree(context);
tree index_tree = this->index_->get_tree(context);
diff -r 1fd3326a792f go/gogo.cc
--- a/go/gogo.cc Wed Dec 22 15:08:11 2010 -0800
+++ b/go/gogo.cc Wed Dec 22 15:20:36 2010 -0800
@@ -3160,7 +3160,12 @@
Variable::type_from_tuple(Expression* expr, bool report_error) const
{
if (expr->map_index_expression() != NULL)
- return expr->map_index_expression()->get_map_type()->val_type();
+ {
+ Map_type* mt = expr->map_index_expression()->get_map_type();
+ if (mt == NULL)
+ return Type::make_error_type();
+ return mt->val_type();
+ }
else if (expr->receive_expression() != NULL)
{
Expression* channel = expr->receive_expression()->channel();
diff -r 1fd3326a792f go/statements.cc
--- a/go/statements.cc Wed Dec 22 15:08:11 2010 -0800
+++ b/go/statements.cc Wed Dec 22 15:20:36 2010 -0800
@@ -922,6 +922,8 @@
return Statement::make_error_statement(loc);
}
Map_type* map_type = map_index->get_map_type();
+ if (map_type == NULL)
+ return Statement::make_error_statement(loc);
Block* b = new Block(enclosing, loc);
@@ -1066,6 +1068,8 @@
return Statement::make_error_statement(loc);
}
Map_type* map_type = map_index->get_map_type();
+ if (map_type == NULL)
+ return Statement::make_error_statement(loc);
Block* b = new Block(enclosing, loc);