r292639 - Revert r292508 given that we intend to remove driver options for cxx modules.

[Manman Ren via cfe-commits]

Author: mren
Date: Fri Jan 20 14:03:00 2017
New Revision: 292639

URL: http://llvm.org/viewvc/llvm-project?rev=292639&view=rev
Log:
Revert r292508 given that we intend to remove driver options for cxx modules.

Removed:
    cfe/trunk/test/Modules/check-syntax.mm
Modified:
    cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
    cfe/trunk/lib/Parse/ParseObjc.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=292639&r1=292638&r2=292639&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Fri Jan 20 14:03:00 2017
@@ -243,10 +243,7 @@ def err_expected_property_name : Error<"
 
 def err_unexpected_at : Error<"unexpected '@' in program">;
 def err_atimport : Error<
-  "use of '@import' when modules are disabled">;
-def err_atimport_cxx : Error<
-  "use of '@import' when C++ modules are disabled, consider using fmodules "
-  "and fcxx-modules">;
+"use of '@import' when modules are disabled">;
 
 def err_invalid_reference_qualifier_application : Error<
   "'%0' qualifier may not be applied to a reference">;

Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=292639&r1=292638&r2=292639&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Fri Jan 20 14:03:00 2017
@@ -83,10 +83,7 @@ Parser::DeclGroupPtrTy Parser::ParseObjC
   case tok::objc_import:
     if (getLangOpts().Modules || getLangOpts().DebuggerSupport)
       return ParseModuleImport(AtLoc);
-    if (getLangOpts().CPlusPlus)
-      Diag(AtLoc, diag::err_atimport_cxx);
-    else
-      Diag(AtLoc, diag::err_atimport);
+    Diag(AtLoc, diag::err_atimport);
     SkipUntil(tok::semi);
     return Actions.ConvertDeclToDeclGroup(nullptr);
   default:

Removed: cfe/trunk/test/Modules/check-syntax.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/check-syntax.mm?rev=292638&view=auto
==============================================================================
--- cfe/trunk/test/Modules/check-syntax.mm (original)
+++ cfe/trunk/test/Modules/check-syntax.mm (removed)
@@ -1,5 +0,0 @@
-// RUN: not %clang -fmodules -fno-cxx-modules -fsyntax-only %s 2>&1 | FileCheck %s
-// rdar://19399671
-
-// CHECK: use of '@import' when C++ modules are disabled
- at import Foundation;