diff options
| -rw-r--r-- | lib/Sema/TargetAttributesSema.cpp | 8 | ||||
| -rw-r--r-- | test/Rewriter/dllimport-typedef.c | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/lib/Sema/TargetAttributesSema.cpp b/lib/Sema/TargetAttributesSema.cpp index 35e42fb696..87e7b9d00b 100644 --- a/lib/Sema/TargetAttributesSema.cpp +++ b/lib/Sema/TargetAttributesSema.cpp @@ -115,8 +115,12 @@ static void HandleDLLImportAttr(Decl *D, const AttributeList &Attr, Sema &S) { FunctionDecl *FD = dyn_cast<FunctionDecl>(D); if (!FD) { - S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) - << Attr.getName() << 2 /*variable and function*/; + // Apparently Visual C++ thinks it is okay to not emit a warning + // in this case, so only emit a warning when -fms-extensions is not + // specified. + if (!S.getLangOptions().Microsoft) + S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) + << Attr.getName() << 2 /*variable and function*/; return; } diff --git a/test/Rewriter/dllimport-typedef.c b/test/Rewriter/dllimport-typedef.c new file mode 100644 index 0000000000..28d2e297fa --- /dev/null +++ b/test/Rewriter/dllimport-typedef.c @@ -0,0 +1,17 @@ +// RUN: %clang_cc1 -triple i686-pc-win32 -fms-extensions -fsyntax-only %s 2>&1 | FileCheck -check-prefix=CHECK-NEG %s +// RUN: %clang_cc1 -triple i686-pc-win32 -fsyntax-only %s 2>&1 | FileCheck -check-prefix=CHECK-POS %s + +// Do not report an error with including dllimport in the typedef when -fms-extensions is specified. +// Addresses <rdar://problem/7653870>. +typedef __declspec(dllimport) int CB(void); + +// This function is added just to trigger a diagnostic. This way we can test how many +// diagnostics we expect. +void bar() { return 1; } + +// CHECK-NEG: warning: void function 'bar' should not return a value +// CHECK-NEG: 1 diagnostic generated +// CHECK-POS: warning: 'dllimport' attribute only applies to variable and function type +// CHECK-POS: warning: void function 'bar' should not return a value +// CHECK-POS: 2 diagnostics generated + |