From: David Majnemer Date: Fri, 10 Jun 2016 18:24:41 +0000 (+0000) Subject: [-fms-extensions] Permit incomplete types in dynamic exception specifications X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0baecc728c4a43d8050fbb4c0e6e91a01c5836e4;p=clang [-fms-extensions] Permit incomplete types in dynamic exception specifications Microsoft headers, comdef.h and comutil.h, assume that this is an OK thing to do. Downgrade the hard error to a warning if we are in -fms-extensions mode. This fixes PR28080. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@272412 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 1813544a78..bc6e2024a5 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1223,6 +1223,8 @@ def err_distant_exception_spec : Error< def err_incomplete_in_exception_spec : Error< "%select{|pointer to |reference to }0incomplete type %1 is not allowed " "in exception specification">; +def ext_incomplete_in_exception_spec : ExtWarn, + InGroup; def err_rref_in_exception_spec : Error< "rvalue reference type %0 is not allowed in exception specification">; def err_mismatched_exception_spec : Error< diff --git a/lib/Sema/SemaExceptionSpec.cpp b/lib/Sema/SemaExceptionSpec.cpp index f12bf2415d..f2ae6bfe2f 100644 --- a/lib/Sema/SemaExceptionSpec.cpp +++ b/lib/Sema/SemaExceptionSpec.cpp @@ -110,10 +110,13 @@ bool Sema::CheckSpecifiedExceptionType(QualType &T, SourceRange Range) { // A type denoted in an exception-specification shall not denote a // pointer or reference to an incomplete type, other than (cv) void* or a // pointer or reference to a class currently being defined. + // In Microsoft mode, downgrade this to a warning. + unsigned DiagID = diag::err_incomplete_in_exception_spec; + if (getLangOpts().MicrosoftExt) + DiagID = diag::ext_incomplete_in_exception_spec; if (!(PointeeT->isRecordType() && PointeeT->getAs()->isBeingDefined()) && - RequireCompleteType(Range.getBegin(), PointeeT, - diag::err_incomplete_in_exception_spec, Kind, Range)) + RequireCompleteType(Range.getBegin(), PointeeT, DiagID, Kind, Range)) return true; return false; diff --git a/test/SemaCXX/ms-exception-spec.cpp b/test/SemaCXX/ms-exception-spec.cpp index 1be8ec2936..81e04dd54d 100644 --- a/test/SemaCXX/ms-exception-spec.cpp +++ b/test/SemaCXX/ms-exception-spec.cpp @@ -1,4 +1,8 @@ // RUN: %clang_cc1 %s -fsyntax-only -verify -fms-extensions -// expected-no-diagnostics void f() throw(...) { } + +namespace PR28080 { +struct S; // expected-note {{forward declaration}} +void fn() throw(S); // expected-warning {{incomplete type}} +}