From e32fe3b81fca5fe93e466bc5b7d9f317c065de6c Mon Sep 17 00:00:00 2001
From: Manman Ren <manman.ren@gmail.com>
Date: Fri, 20 Jan 2017 20:03:00 +0000
Subject: [PATCH] Revert r292508 given that we intend to remove driver options
for cxx modules.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@292639 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/clang/Basic/DiagnosticParseKinds.td | 5 +----
lib/Parse/ParseObjc.cpp | 5 +----
test/Modules/check-syntax.mm | 5 -----
3 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 test/Modules/check-syntax.mm
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index 2641616028c..19b95cd5bd9 100644
--- a/include/clang/Basic/DiagnosticParseKinds.td
+++ b/include/clang/Basic/DiagnosticParseKinds.td
@@ -243,10 +243,7 @@ def err_expected_property_name : Error<"expected property name">;
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">;
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 68768e18355..81761bf8d2d 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -83,10 +83,7 @@ Parser::DeclGroupPtrTy Parser::ParseObjCAtDirectives() {
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:
diff --git a/test/Modules/check-syntax.mm b/test/Modules/check-syntax.mm
deleted file mode 100644
index ebb4bd3faf3..00000000000
--- a/test/Modules/check-syntax.mm
+++ /dev/null
@@ -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
-@import Foundation;
--
GitLab