From 85c351551688a101c5ce918e5d60dea5177d72e7 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sun, 22 Feb 2009 00:20:44 +0000 Subject: [PATCH] Sanity fix for PR3642: if we're treating a diagnostic as an error, it's required to actually be an error for correctness. The attached testcase now gives an error instead of mysteriously crashing. Now, it's possible we actually want to support the given usage, but I haven't looked at the relevant code closely. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65253 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.def | 2 +- test/Sema/struct-decl.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def index 7ebb5a706c..fb9f36399b 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.def +++ b/include/clang/Basic/DiagnosticSemaKinds.def @@ -728,7 +728,7 @@ DIAG(err_field_declared_as_function, ERROR, "field %0 declared as a function") DIAG(err_field_incomplete, ERROR, "field has incomplete type %0") -DIAG(err_variable_sized_type_in_struct, EXTENSION, +DIAG(err_variable_sized_type_in_struct, ERROR, "variable sized type %0 must be at end of struct or class") DIAG(err_flexible_array_empty_struct, ERROR, "flexible array %0 not allowed in otherwise empty struct") diff --git a/test/Sema/struct-decl.c b/test/Sema/struct-decl.c index cdc9eaae3b..aa2d3b6342 100644 --- a/test/Sema/struct-decl.c +++ b/test/Sema/struct-decl.c @@ -22,3 +22,14 @@ int foo() { struct st *f; return f->v + f[0].v; } + +// PR3642 +struct pppoe_tag { + short tag_type; + char tag_data[]; +}; +struct datatag { + struct pppoe_tag hdr; //expected-error{{variable sized type 'hdr' must be at end of struct}} + char data; +}; +