diff options
| author | Manman Ren <manman.ren@gmail.com> | 2017-01-19 19:05:55 +0000 |
|---|---|---|
| committer | Manman Ren <manman.ren@gmail.com> | 2017-01-19 19:05:55 +0000 |
| commit | 103c86b73b9b22adf7932a7e67ba645e38800c0d (patch) | |
| tree | 86e2601dcac18202ce4988da44ac6a0878bb5418 /lib/Parse | |
| parent | 32236fa243320947eafbd1d8ede9e75097ce6ee2 (diff) | |
Module: Improve diagnostic message when cxx modules are disabled and @import is used in Objective CXX.
rdar://problem/19399671
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@292508 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse')
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 81761bf8d2..68768e1835 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -83,7 +83,10 @@ Parser::DeclGroupPtrTy Parser::ParseObjCAtDirectives() { case tok::objc_import: if (getLangOpts().Modules || getLangOpts().DebuggerSupport) return ParseModuleImport(AtLoc); - Diag(AtLoc, diag::err_atimport); + if (getLangOpts().CPlusPlus) + Diag(AtLoc, diag::err_atimport_cxx); + else + Diag(AtLoc, diag::err_atimport); SkipUntil(tok::semi); return Actions.ConvertDeclToDeclGroup(nullptr); default: |