summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/clang/Basic/DiagnosticGroups.td1
-rw-r--r--include/clang/Basic/DiagnosticLexKinds.td5
-rw-r--r--lib/Lex/HeaderSearch.cpp65
-rw-r--r--test/Modules/Inputs/double-quotes/A.framework/Headers/A.h6
-rw-r--r--test/Modules/Inputs/double-quotes/A.framework/Headers/A0.h1
-rw-r--r--test/Modules/Inputs/double-quotes/A.framework/Modules/module.modulemap5
-rw-r--r--test/Modules/Inputs/double-quotes/B.h1
-rw-r--r--test/Modules/Inputs/double-quotes/X.framework/Headers/X.h1
-rw-r--r--test/Modules/Inputs/double-quotes/X.framework/Modules/module.modulemap4
-rw-r--r--test/Modules/Inputs/double-quotes/a.hmap.json6
-rw-r--r--test/Modules/Inputs/double-quotes/flat-header-path/Z.h1
-rw-r--r--test/Modules/Inputs/double-quotes/flat-header-path/Z.modulemap4
-rw-r--r--test/Modules/Inputs/double-quotes/x.hmap.json7
-rw-r--r--test/Modules/Inputs/double-quotes/z.yaml28
-rw-r--r--test/Modules/double-quotes.m39
15 files changed, 1 insertions, 173 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 7cc9967738..643c178743 100644
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -31,7 +31,6 @@ def AutoDisableVptrSanitizer : DiagGroup<"auto-disable-vptr-sanitizer">;
def Availability : DiagGroup<"availability">;
def Section : DiagGroup<"section">;
def AutoImport : DiagGroup<"auto-import">;
-def FrameworkHdrQuotedInclude : DiagGroup<"quoted-include-in-framework-header">;
def CXX14BinaryLiteral : DiagGroup<"c++14-binary-literal">;
def CXXPre14CompatBinaryLiteral : DiagGroup<"c++98-c++11-compat-binary-literal">;
def GNUBinaryLiteral : DiagGroup<"gnu-binary-literal">;
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td
index de6bffcdca..9b7f7e6777 100644
--- a/include/clang/Basic/DiagnosticLexKinds.td
+++ b/include/clang/Basic/DiagnosticLexKinds.td
@@ -714,11 +714,6 @@ def warn_mmap_redundant_export_as : Warning<
def err_mmap_submodule_export_as : Error<
"only top-level modules can be re-exported as public">;
-def warn_quoted_include_in_framework_header : Warning<
- "double-quoted include \"%0\" in framework header, "
- "expected angle-bracketed instead"
- >, InGroup<FrameworkHdrQuotedInclude>, DefaultIgnore;
-
def warn_auto_module_import : Warning<
"treating #%select{include|import|include_next|__include_macros}0 as an "
"import of module '%1'">, InGroup<AutoImport>, DefaultIgnore;
diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp
index 757cd097e4..1f2c339ea3 100644
--- a/lib/Lex/HeaderSearch.cpp
+++ b/lib/Lex/HeaderSearch.cpp
@@ -621,59 +621,6 @@ static const char *copyString(StringRef Str, llvm::BumpPtrAllocator &Alloc) {
return CopyStr;
}
-static bool isFrameworkStylePath(StringRef Path,
- SmallVectorImpl<char> &FrameworkName) {
- using namespace llvm::sys;
- path::const_iterator I = path::begin(Path);
- path::const_iterator E = path::end(Path);
-
- // Detect different types of framework style paths:
- //
- // ...Foo.framework/{Headers,PrivateHeaders}
- // ...Foo.framework/Versions/{A,Current}/{Headers,PrivateHeaders}
- // ...Foo.framework/Frameworks/Nested.framework/{Headers,PrivateHeaders}
- // ...<other variations with 'Versions' like in the above path>
- //
- // and some other variations among these lines.
- int FoundComp = 0;
- while (I != E) {
- if (I->endswith(".framework")) {
- FrameworkName.append(I->begin(), I->end());
- ++FoundComp;
- }
- if (*I == "Headers" || *I == "PrivateHeaders")
- ++FoundComp;
- ++I;
- }
-
- return FoundComp >= 2;
-}
-
-static void
-diagnoseFrameworkInclude(DiagnosticsEngine &Diags, SourceLocation IncludeLoc,
- StringRef Includer, StringRef IncludeFilename,
- const FileEntry *IncludeFE, bool isAngled = false,
- bool FoundByHeaderMap = false) {
- SmallString<128> FromFramework, ToFramework;
- if (!isFrameworkStylePath(Includer, FromFramework))
- return;
- bool IsIncludeeInFramework =
- isFrameworkStylePath(IncludeFE->getName(), ToFramework);
-
- if (!isAngled && !FoundByHeaderMap) {
- SmallString<128> NewInclude("<");
- if (IsIncludeeInFramework) {
- NewInclude += StringRef(ToFramework).drop_back(10); // drop .framework
- NewInclude += "/";
- }
- NewInclude += IncludeFilename;
- NewInclude += ">";
- Diags.Report(IncludeLoc, diag::warn_quoted_include_in_framework_header)
- << IncludeFilename
- << FixItHint::CreateReplacement(IncludeLoc, NewInclude);
- }
-}
-
/// LookupFile - Given a "foo" or \<foo> reference, look up the indicated file,
/// return null on failure. isAngled indicates whether the file reference is
/// for system \#include's or not (i.e. using <> instead of ""). Includers, if
@@ -775,12 +722,8 @@ const FileEntry *HeaderSearch::LookupFile(
RelativePath->clear();
RelativePath->append(Filename.begin(), Filename.end());
}
- if (First) {
- diagnoseFrameworkInclude(Diags, IncludeLoc,
- IncluderAndDir.second->getName(), Filename,
- FE);
+ if (First)
return FE;
- }
// Otherwise, we found the path via MSVC header search rules. If
// -Wmsvc-include is enabled, we have to keep searching to see if we
@@ -891,12 +834,6 @@ const FileEntry *HeaderSearch::LookupFile(
return MSFE;
}
- bool FoundByHeaderMap = !IsMapped ? false : *IsMapped;
- if (!Includers.empty())
- diagnoseFrameworkInclude(Diags, IncludeLoc,
- Includers.front().second->getName(), Filename,
- FE, isAngled, FoundByHeaderMap);
-
// Remember this location for the next lookup we do.
CacheLookup.HitIdx = i;
return FE;
diff --git a/test/Modules/Inputs/double-quotes/A.framework/Headers/A.h b/test/Modules/Inputs/double-quotes/A.framework/Headers/A.h
deleted file mode 100644
index 17ceb83bb9..0000000000
--- a/test/Modules/Inputs/double-quotes/A.framework/Headers/A.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "A0.h"
-#include "B.h"
-
-#include "X.h"
-
-int foo();
diff --git a/test/Modules/Inputs/double-quotes/A.framework/Headers/A0.h b/test/Modules/Inputs/double-quotes/A.framework/Headers/A0.h
deleted file mode 100644
index 79c6b8893b..0000000000
--- a/test/Modules/Inputs/double-quotes/A.framework/Headers/A0.h
+++ /dev/null
@@ -1 +0,0 @@
-// double-quotes/A.framework/Headers/A0.h
diff --git a/test/Modules/Inputs/double-quotes/A.framework/Modules/module.modulemap b/test/Modules/Inputs/double-quotes/A.framework/Modules/module.modulemap
deleted file mode 100644
index 09a887a8f4..0000000000
--- a/test/Modules/Inputs/double-quotes/A.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,5 +0,0 @@
-// double-quotes/A.framework/Modules/module.modulemap
-framework module A {
- header "A.h"
- header "A0.h"
-}
diff --git a/test/Modules/Inputs/double-quotes/B.h b/test/Modules/Inputs/double-quotes/B.h
deleted file mode 100644
index 724faaef80..0000000000
--- a/test/Modules/Inputs/double-quotes/B.h
+++ /dev/null
@@ -1 +0,0 @@
-// double-quotes/B.h
diff --git a/test/Modules/Inputs/double-quotes/X.framework/Headers/X.h b/test/Modules/Inputs/double-quotes/X.framework/Headers/X.h
deleted file mode 100644
index 0185751299..0000000000
--- a/test/Modules/Inputs/double-quotes/X.framework/Headers/X.h
+++ /dev/null
@@ -1 +0,0 @@
-// double-quotes/X.framework/Headers/X.h
diff --git a/test/Modules/Inputs/double-quotes/X.framework/Modules/module.modulemap b/test/Modules/Inputs/double-quotes/X.framework/Modules/module.modulemap
deleted file mode 100644
index 95524704c6..0000000000
--- a/test/Modules/Inputs/double-quotes/X.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,4 +0,0 @@
-// double-quotes/X.framework/Modules/module.modulemap
-framework module X {
- header "X.h"
-}
diff --git a/test/Modules/Inputs/double-quotes/a.hmap.json b/test/Modules/Inputs/double-quotes/a.hmap.json
deleted file mode 100644
index bdd383ce41..0000000000
--- a/test/Modules/Inputs/double-quotes/a.hmap.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "mappings" :
- {
- "A.h" : "A/A.h"
- }
-}
diff --git a/test/Modules/Inputs/double-quotes/flat-header-path/Z.h b/test/Modules/Inputs/double-quotes/flat-header-path/Z.h
deleted file mode 100644
index db96b64962..0000000000
--- a/test/Modules/Inputs/double-quotes/flat-header-path/Z.h
+++ /dev/null
@@ -1 +0,0 @@
-#import "B.h" // Included from Z.h & A.h
diff --git a/test/Modules/Inputs/double-quotes/flat-header-path/Z.modulemap b/test/Modules/Inputs/double-quotes/flat-header-path/Z.modulemap
deleted file mode 100644
index 34441b0701..0000000000
--- a/test/Modules/Inputs/double-quotes/flat-header-path/Z.modulemap
+++ /dev/null
@@ -1,4 +0,0 @@
-// double-quotes/flat-header-path/Z.modulemap
-framework module Z {
- header "Z.h"
-}
diff --git a/test/Modules/Inputs/double-quotes/x.hmap.json b/test/Modules/Inputs/double-quotes/x.hmap.json
deleted file mode 100644
index 2b6a059564..0000000000
--- a/test/Modules/Inputs/double-quotes/x.hmap.json
+++ /dev/null
@@ -1,7 +0,0 @@
-
-{
- "mappings" :
- {
- "X.h" : "X/X.h"
- }
-}
diff --git a/test/Modules/Inputs/double-quotes/z.yaml b/test/Modules/Inputs/double-quotes/z.yaml
deleted file mode 100644
index 242f821346..0000000000
--- a/test/Modules/Inputs/double-quotes/z.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- 'version': 0,
- 'case-sensitive': 'false',
- 'roots': [
- {
- 'type': 'directory',
- 'name': "TEST_DIR/Z.framework/Headers",
- 'contents': [
- {
- 'type': 'file',
- 'name': "Z.h",
- 'external-contents': "TEST_DIR/flat-header-path/Z.h"
- }
- ]
- },
- {
- 'type': 'directory',
- 'name': "TEST_DIR/Z.framework/Modules",
- 'contents': [
- {
- 'type': 'file',
- 'name': "module.modulemap",
- 'external-contents': "TEST_DIR/flat-header-path/Z.modulemap"
- }
- ]
- }
- ]
-}
diff --git a/test/Modules/double-quotes.m b/test/Modules/double-quotes.m
deleted file mode 100644
index b0dbf662a1..0000000000
--- a/test/Modules/double-quotes.m
+++ /dev/null
@@ -1,39 +0,0 @@
-// REQUIRES: shell
-
-// RUN: rm -rf %t
-// RUN: mkdir %t
-
-// RUN: hmaptool write %S/Inputs/double-quotes/a.hmap.json %t/a.hmap
-// RUN: hmaptool write %S/Inputs/double-quotes/x.hmap.json %t/x.hmap
-
-// RUN: sed -e "s:TEST_DIR:%S/Inputs/double-quotes:g" \
-// RUN: %S/Inputs/double-quotes/z.yaml > %t/z.yaml
-
-// The output with and without modules should be the same
-
-// RUN: %clang_cc1 \
-// RUN: -I %t/x.hmap -iquote %t/a.hmap -ivfsoverlay %t/z.yaml \
-// RUN: -F%S/Inputs/double-quotes -I%S/Inputs/double-quotes \
-// RUN: -Wquoted-include-in-framework-header -fsyntax-only %s -verify
-
-// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache \
-// RUN: -I %t/x.hmap -iquote %t/a.hmap -ivfsoverlay %t/z.yaml \
-// RUN: -F%S/Inputs/double-quotes -I%S/Inputs/double-quotes \
-// RUN: -Wquoted-include-in-framework-header -fsyntax-only %s \
-// RUN: 2>%t/stderr
-
-// The same warnings show up when modules is on but -verify doesn't get it
-// because they only show up under the module A building context.
-// RUN: FileCheck --input-file=%t/stderr %s
-// CHECK: double-quoted include "A0.h" in framework header, expected angle-bracketed instead
-// CHECK: double-quoted include "B.h" in framework header, expected angle-bracketed instead
-// CHECK: double-quoted include "B.h" in framework header, expected angle-bracketed instead
-
-#import "A.h"
-#import <Z/Z.h>
-
-int bar() { return foo(); }
-
-// expected-warning@Inputs/double-quotes/A.framework/Headers/A.h:1{{double-quoted include "A0.h" in framework header, expected angle-bracketed instead}}
-// expected-warning@Inputs/double-quotes/A.framework/Headers/A.h:2{{double-quoted include "B.h" in framework header, expected angle-bracketed instead}}
-// expected-warning@Inputs/double-quotes/flat-header-path/Z.h:1{{double-quoted include "B.h" in framework header, expected angle-bracketed instead}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 01:51:28 +0000