diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 38181904f871caa9a3f811031a765f8892603c85..979c81f6361b6d26fa69aeca96043f767344742e 100644
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -390,7 +390,6 @@ def : DiagGroup<"sequence-point", [Unsequenced]>;
def AmbiguousMacro : DiagGroup<"ambiguous-macro">;
def KeywordAsMacro : DiagGroup<"keyword-macro">;
def ReservedIdAsMacro : DiagGroup<"reserved-id-macro">;
-def NonportableIncludePath : DiagGroup<"nonportable-include-path">;
// Just silence warnings about -Wstrict-aliasing for now.
def : DiagGroup<"strict-aliasing=0">;
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td
index 52116a603d53dd72a7262f822fb5b1267c249646..dab8cf279ca39771c435609e3e9ad48fcdbb878e 100644
--- a/include/clang/Basic/DiagnosticLexKinds.td
+++ b/include/clang/Basic/DiagnosticLexKinds.td
@@ -274,10 +274,6 @@ def ext_missing_whitespace_after_macro_name : ExtWarn<
"whitespace required after macro name">;
def warn_missing_whitespace_after_macro_name : Warning<
"whitespace recommended after macro name">;
-def pp_nonportable_path : Warning<
- "non-portable path to file '%0'; specified path differs in case from file"
- " name on disk">,
- InGroup<NonportableIncludePath>;
def pp_pragma_once_in_main_file : Warning<"#pragma once in main file">,
InGroup<DiagGroup<"pragma-once-outside-header">>;
diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h
index b6a9ca702842c38d08fed41387b2cba23826a2b0..17758ec3f398828f30fb7907edb2f1fe138a1874 100644
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -52,7 +52,6 @@ public:
/// descriptor for the file.
class FileEntry {
const char *Name; // Name of the file.
- std::string RealPathName; // Real path to the file; could be empty.
off_t Size; // File size in bytes.
time_t ModTime; // Modification time of file.
const DirectoryEntry *Dir; // Directory file lives in.
@@ -83,7 +82,6 @@ public:
}
const char *getName() const { return Name; }
- StringRef tryGetRealPathName() const { return RealPathName; }
bool isValid() const { return IsValid; }
off_t getSize() const { return Size; }
unsigned getUID() const { return UID; }
diff --git a/include/clang/Basic/VirtualFileSystem.h b/include/clang/Basic/VirtualFileSystem.h
index 4353f8458811f781bcbceaf0aeff28e8f19b3115..bc09e67878842a1d6d53d4ae30eee61d320747be 100644
--- a/include/clang/Basic/VirtualFileSystem.h
+++ b/include/clang/Basic/VirtualFileSystem.h
@@ -91,13 +91,6 @@ public:
virtual ~File();
/// \brief Get the status of the file.
virtual llvm::ErrorOr<Status> status() = 0;
- /// \brief Get the name of the file
- virtual llvm::ErrorOr<StringRef> getName() {
- if (auto Status = status())
- return Status->getName();
- else
- return Status.getError();
- }
/// \brief Get the contents of the file as a \p MemoryBuffer.
virtual llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
getBuffer(const Twine &Name, int64_t FileSize = -1,
diff --git a/include/clang/Lex/DirectoryLookup.h b/include/clang/Lex/DirectoryLookup.h
index ee0af292e6fccac6c6a221d229dfe3ad85576e3a..20c4bb03ab6e607a4f53ed25f0ee16af236b68db 100644
--- a/include/clang/Lex/DirectoryLookup.h
+++ b/include/clang/Lex/DirectoryLookup.h
@@ -151,9 +151,6 @@ public:
///
/// \param HS The header search instance to search with.
///
- /// \param IncludeLoc the source location of the #include or #import
- /// directive.
- ///
/// \param SearchPath If not NULL, will be set to the search path relative
/// to which the file was found.
///
@@ -175,7 +172,6 @@ public:
/// a framework include ("Foo.h" -> "Foo/Foo.h"), set the new name to this
/// vector and point Filename to it.
const FileEntry *LookupFile(StringRef &Filename, HeaderSearch &HS,
- SourceLocation IncludeLoc,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
Module *RequestingModule,
diff --git a/include/clang/Lex/HeaderSearch.h b/include/clang/Lex/HeaderSearch.h
index 7bac01ef3a4ce8ba20ddbcd2c01b71559987b86a..152258af166944f85c0b687328821a761084815c 100644
--- a/include/clang/Lex/HeaderSearch.h
+++ b/include/clang/Lex/HeaderSearch.h
@@ -580,9 +580,8 @@ private:
/// \brief Look up the file with the specified name and determine its owning
/// module.
const FileEntry *
- getFileAndSuggestModule(StringRef FileName, SourceLocation IncludeLoc,
- const DirectoryEntry *Dir, bool IsSystemHeaderDir,
- Module *RequestingModule,
+ getFileAndSuggestModule(StringRef FileName, const DirectoryEntry *Dir,
+ bool IsSystemHeaderDir, Module *RequestingModule,
ModuleMap::KnownHeader *SuggestedModule);
public:
diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp
index f9fa2338992333fe2342b74befa797e915dd24d3..c4cc8dc5419d4840e281a8252ed7e542493efdd5 100644
--- a/lib/Basic/FileManager.cpp
+++ b/lib/Basic/FileManager.cpp
@@ -312,9 +312,6 @@ const FileEntry *FileManager::getFile(StringRef Filename, bool openFile,
UFE.InPCH = Data.InPCH;
UFE.File = std::move(F);
UFE.IsValid = true;
- if (UFE.File)
- if (auto RealPathName = UFE.File->getName())
- UFE.RealPathName = RealPathName->str();
return &UFE;
}
diff --git a/lib/Basic/VirtualFileSystem.cpp b/lib/Basic/VirtualFileSystem.cpp
index 120d7e0d9e05ad535fd41375f722cafc2c156c7c..d64c4e3d8c06bf42a77650a86abcc7d6cb602b24 100644
--- a/lib/Basic/VirtualFileSystem.cpp
+++ b/lib/Basic/VirtualFileSystem.cpp
@@ -140,19 +140,16 @@ namespace {
class RealFile : public File {
int FD;
Status S;
- std::string RealName;
friend class RealFileSystem;
- RealFile(int FD, StringRef NewName, StringRef NewRealPathName)
+ RealFile(int FD, StringRef NewName)
: FD(FD), S(NewName, {}, {}, {}, {}, {},
- llvm::sys::fs::file_type::status_error, {}),
- RealName(NewRealPathName.str()) {
+ llvm::sys::fs::file_type::status_error, {}) {
assert(FD >= 0 && "Invalid or inactive file descriptor");
}
public:
~RealFile() override;
ErrorOr<Status> status() override;
- ErrorOr<StringRef> getName() override;
ErrorOr<std::unique_ptr<MemoryBuffer>> getBuffer(const Twine &Name,
int64_t FileSize,
bool RequiresNullTerminator,
@@ -173,10 +170,6 @@ ErrorOr<Status> RealFile::status() {
return S;
}
-ErrorOr<StringRef> RealFile::getName() {
- return RealName.empty() ? S.getName() : StringRef(RealName);
-}
-
ErrorOr<std::unique_ptr<MemoryBuffer>>
RealFile::getBuffer(const Twine &Name, int64_t FileSize,
bool RequiresNullTerminator, bool IsVolatile) {
@@ -214,10 +207,9 @@ ErrorOr<Status> RealFileSystem::status(const Twine &Path) {
ErrorOr<std::unique_ptr<File>>
RealFileSystem::openFileForRead(const Twine &Name) {
int FD;
- SmallString<256> RealName;
- if (std::error_code EC = sys::fs::openFileForRead(Name, FD, &RealName))
+ if (std::error_code EC = sys::fs::openFileForRead(Name, FD))
return EC;
- return std::unique_ptr<File>(new RealFile(FD, Name.str(), RealName.str()));
+ return std::unique_ptr<File>(new RealFile(FD, Name.str()));
}
llvm::ErrorOr<std::string> RealFileSystem::getCurrentWorkingDirectory() const {
diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp
index e5cc30e41c573554a9ea45e58c9037967d9848fd..f7fc0b0f65fc61bbbee04c4faf4fdb84a0990dc2 100644
--- a/lib/Lex/HeaderSearch.cpp
+++ b/lib/Lex/HeaderSearch.cpp
@@ -250,9 +250,8 @@ const char *DirectoryLookup::getName() const {
}
const FileEntry *HeaderSearch::getFileAndSuggestModule(
- StringRef FileName, SourceLocation IncludeLoc, const DirectoryEntry *Dir,
- bool IsSystemHeaderDir, Module *RequestingModule,
- ModuleMap::KnownHeader *SuggestedModule) {
+ StringRef FileName, const DirectoryEntry *Dir, bool IsSystemHeaderDir,
+ Module *RequestingModule, ModuleMap::KnownHeader *SuggestedModule) {
// If we have a module map that might map this header, load it and
// check whether we'll have a suggestion for a module.
const FileEntry *File = getFileMgr().getFile(FileName, /*OpenFile=*/true);
@@ -273,7 +272,6 @@ const FileEntry *HeaderSearch::getFileAndSuggestModule(
const FileEntry *DirectoryLookup::LookupFile(
StringRef &Filename,
HeaderSearch &HS,
- SourceLocation IncludeLoc,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
Module *RequestingModule,
@@ -299,7 +297,7 @@ const FileEntry *DirectoryLookup::LookupFile(
RelativePath->append(Filename.begin(), Filename.end());
}
- return HS.getFileAndSuggestModule(TmpDir, IncludeLoc, getDir(),
+ return HS.getFileAndSuggestModule(TmpDir, getDir(),
isSystemHeaderDirectory(),
RequestingModule, SuggestedModule);
}
@@ -587,7 +585,7 @@ const FileEntry *HeaderSearch::LookupFile(
RelativePath->append(Filename.begin(), Filename.end());
}
// Otherwise, just return the file.
- return getFileAndSuggestModule(Filename, IncludeLoc, nullptr,
+ return getFileAndSuggestModule(Filename, nullptr,
/*IsSystemHeaderDir*/false,
RequestingModule, SuggestedModule);
}
@@ -624,7 +622,7 @@ const FileEntry *HeaderSearch::LookupFile(
Includer ? getFileInfo(Includer).DirInfo != SrcMgr::C_User :
BuildSystemModule;
if (const FileEntry *FE = getFileAndSuggestModule(
- TmpDir, IncludeLoc, IncluderAndDir.second, IncluderIsSystemHeader,
+ TmpDir, IncluderAndDir.second, IncluderIsSystemHeader,
RequestingModule, SuggestedModule)) {
if (!Includer) {
assert(First && "only first includer can have no file");
@@ -715,7 +713,7 @@ const FileEntry *HeaderSearch::LookupFile(
bool InUserSpecifiedSystemFramework = false;
bool HasBeenMapped = false;
const FileEntry *FE = SearchDirs[i].LookupFile(
- Filename, *this, IncludeLoc, SearchPath, RelativePath, RequestingModule,
+ Filename, *this, SearchPath, RelativePath, RequestingModule,
SuggestedModule, InUserSpecifiedSystemFramework, HasBeenMapped,
MappedName);
if (HasBeenMapped) {
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index dccb588cb2a555ee8113550dee36b27249bc6ea3..34adf7fac29ad9045145fa8e976ca2d1da8b138c 100644
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -24,9 +24,6 @@
#include "clang/Lex/ModuleLoader.h"
#include "clang/Lex/Pragma.h"
#include "llvm/ADT/APInt.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/iterator_range.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/SaveAndRestore.h"
@@ -1559,41 +1556,6 @@ static void diagnoseAutoModuleImport(
("@import " + PathString + ";").str());
}
-namespace {
- // Given a vector of path components and a string containing the real
- // path to the file, build a properly-cased replacement in the vector,
- // and return true if the replacement should be suggested.
- bool TrySimplifyPath(SmallVectorImpl<StringRef> &Components,
- StringRef RealPathName) {
- auto RealPathComponentIter = llvm::sys::path::rbegin(RealPathName);
- auto RealPathComponentEnd = llvm::sys::path::rend(RealPathName);
- int Cnt = 0;
- bool SuggestReplacement = false;
- // Below is a best-effort to handle ".." in paths. It is admittedly
- // not 100% correct in the presence of symlinks.
- for(auto &Component : llvm::reverse(Components)) {
- if ("." == Component) {
- } else if (".." == Component) {
- ++Cnt;
- } else if (Cnt) {
- --Cnt;
- } else if (RealPathComponentIter != RealPathComponentEnd) {
- if (Component != *RealPathComponentIter) {
- // If these path components differ by more than just case, then we
- // may be looking at symlinked paths. Bail on this diagnostic to avoid
- // noisy false positives.
- SuggestReplacement = RealPathComponentIter->equals_lower(Component);
- if (!SuggestReplacement)
- break;
- Component = *RealPathComponentIter;
- }
- ++RealPathComponentIter;
- }
- }
- return SuggestReplacement;
- }
-}
-
/// HandleIncludeDirective - The "\#include" tokens have just been read, read
/// the file to be included from the lexer, then include it! This is a common
/// routine with functionality shared between \#include, \#include_next and
@@ -1758,35 +1720,6 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
}
}
- // Issue a diagnostic if the name of the file on disk has a different case
- // than the one we're about to open.
- const bool CheckIncludePathPortability =
- File && !File->tryGetRealPathName().empty();
-
- if (CheckIncludePathPortability) {
- StringRef Name = LangOpts.MSVCCompat ? NormalizedPath.c_str() : Filename;
- StringRef RealPathName = File->tryGetRealPathName();
- SmallVector<StringRef, 16> Components(llvm::sys::path::begin(Name),
- llvm::sys::path::end(Name));
-
- if (TrySimplifyPath(Components, RealPathName)) {
- SmallString<128> Path;
- Path.reserve(Name.size()+2);
- Path.push_back(isAngled ? '<' : '"');
- for (auto Component : Components) {
- Path.append(Component);
- // Append the separator the user used, or the close quote
- Path.push_back(
- Path.size() <= Filename.size() ? Filename[Path.size()-1] :
- (isAngled ? '>' : '"'));
- }
- auto Replacement = Path.str().str();
- SourceRange Range(FilenameTok.getLocation(), CharEnd);
- Diag(FilenameTok, diag::pp_nonportable_path) << Replacement <<
- FixItHint::CreateReplacement(Range, Replacement);
- }
- }
-
// Should we enter the source file? Set to false if either the source file is
// known to have no effect beyond its effect on module visibility -- that is,
// if it's got an include guard that is already defined or is a modular header
diff --git a/test/Lexer/Inputs/case-insensitive-include.h b/test/Lexer/Inputs/case-insensitive-include.h
deleted file mode 100644
index 60bdf36dbb7f4d77c6808bcf98e96cbf61d79034..0000000000000000000000000000000000000000
--- a/test/Lexer/Inputs/case-insensitive-include.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-struct S {
- int x;
-};
diff --git a/test/Lexer/case-insensitive-include-ms.c b/test/Lexer/case-insensitive-include-ms.c
deleted file mode 100644
index 86bd8bba68ebd07e25872fe5aea3f147a136b141..0000000000000000000000000000000000000000
--- a/test/Lexer/case-insensitive-include-ms.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// REQUIRES: case-insensitive-filesystem
-
-// RUN: mkdir -p %T/apath
-// RUN: cp %S/Inputs/case-insensitive-include.h %T
-// RUN: cd %T
-// RUN: %clang_cc1 -fsyntax-only -fms-compatibility %s -include %s -I %T -verify
-// RUN: %clang_cc1 -fsyntax-only -fms-compatibility -fdiagnostics-parseable-fixits %s -include %s -I %T 2>&1 | FileCheck %s
-
-#include "..\Output\.\case-insensitive-include.h"
-#include "..\Output\.\Case-Insensitive-Include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:50}:"\"..\\Output\\.\\case-insensitive-include.h\""
-#include "..\output\.\case-insensitive-include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:50}:"\"..\\Output\\.\\case-insensitive-include.h\""
-
-#include "apath\..\.\case-insensitive-include.h"
-#include "apath\..\.\Case-Insensitive-Include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:49}:"\"apath\\..\\.\\case-insensitive-include.h\""
-#include "APath\..\.\case-insensitive-include.h" // For the sake of efficiency, this case is not diagnosed. :-(
diff --git a/test/Lexer/case-insensitive-include.c b/test/Lexer/case-insensitive-include.c
deleted file mode 100644
index d25ff025a8232fbd2a0307b4a8e8ecc201f00d1a..0000000000000000000000000000000000000000
--- a/test/Lexer/case-insensitive-include.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// REQUIRES: case-insensitive-filesystem
-
-// RUN: mkdir -p %T/apath
-// RUN: cp %S/Inputs/case-insensitive-include.h %T
-// RUN: cd %T
-// RUN: %clang_cc1 -fsyntax-only %s -include %s -I %T -verify
-// RUN: %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s -include %s -I %T 2>&1 | FileCheck %s
-
-#include "case-insensitive-include.h"
-#include "Case-Insensitive-Include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:38}:"\"case-insensitive-include.h\""
-
-#include "../Output/./case-insensitive-include.h"
-#include "../Output/./Case-Insensitive-Include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:50}:"\"../Output/./case-insensitive-include.h\""
-#include "../output/./case-insensitive-include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:50}:"\"../Output/./case-insensitive-include.h\""
-
-#include "apath/.././case-insensitive-include.h"
-#include "apath/.././Case-Insensitive-Include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:49}:"\"apath/.././case-insensitive-include.h\""
-#include "APath/.././case-insensitive-include.h" // For the sake of efficiency, this case is not diagnosed. :-(
-
-#include "../Output/./apath/.././case-insensitive-include.h"
-#include "../Output/./APath/.././case-insensitive-include.h" // For the sake of efficiency, this case is not diagnosed. :-(
-#include "../output/./apath/.././case-insensitive-include.h" // expected-warning {{non-portable path}}
-// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:10-[[@LINE-1]]:61}:"\"../Output/./apath/.././case-insensitive-include.h\""
diff --git a/test/PCH/case-insensitive-include.c b/test/PCH/case-insensitive-include.c
index 1dcda273c2f239a2c4339658ece8d24a90fcfb5c..707de702f15dc9d8369e11977976c72312c46c19 100644
--- a/test/PCH/case-insensitive-include.c
+++ b/test/PCH/case-insensitive-include.c
@@ -2,7 +2,7 @@
// Test this without pch.
// RUN: cp %S/Inputs/case-insensitive-include.h %T
-// RUN: %clang_cc1 -Wno-nonportable-include-path -fsyntax-only %s -include %s -I %T -verify
+// RUN: %clang_cc1 -fsyntax-only %s -include %s -I %T -verify
// Test with pch.
// RUN: %clang_cc1 -emit-pch -o %t.pch %s -I %T