Skip to content

fix array->f typechecking #2106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions regression/ansi-c/Struct_ptrmember1/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
struct some_struct
{
int some_field;
} array[10];

int main()
{
array[0].some_field=1;
array->some_field=1;
}
8 changes: 8 additions & 0 deletions regression/ansi-c/Struct_ptrmember1/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
main.c

^EXIT=0$
^SIGNAL=0$
--
^warning: ignoring
^CONVERSION ERROR$
30 changes: 18 additions & 12 deletions src/ansi-c/c_typecheck_expr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1431,25 +1431,31 @@ void c_typecheck_baset::typecheck_expr_ptrmember(exprt &expr)

const typet &final_op0_type=follow(expr.op0().type());

if(final_op0_type.id()!=ID_pointer &&
final_op0_type.id()!=ID_array)
if(final_op0_type.id()==ID_array)
{
// a->f is the same as a[0].f
exprt zero=from_integer(0, index_type());
index_exprt index_expr(expr.op0(), zero, final_op0_type.subtype());
index_expr.set(ID_C_lvalue, true);
expr.op0().swap(index_expr);
}
else if(final_op0_type.id()==ID_pointer)
{
// turn x->y into (*x).y
dereference_exprt deref_expr(expr.op0());
deref_expr.add_source_location()=expr.source_location();
typecheck_expr_dereference(deref_expr);
expr.op0().swap(deref_expr);
}
else
{
err_location(expr);
error() << "ptrmember operator requires pointer type "
error() << "ptrmember operator requires pointer or array type "
"on left hand side, but got `"
<< to_string(expr.op0().type()) << "'" << eom;
throw 0;
}

// turn x->y into (*x).y

dereference_exprt deref(expr.op0());
deref.add_source_location()=expr.source_location();

typecheck_expr_dereference(deref);

expr.op0().swap(deref);

expr.id(ID_member);
typecheck_expr_member(expr);
}
Expand Down