Skip to content

Commit fe74c86

Browse files
authored
Merge pull request #37660 from nkcsgexi/71462726
Frontend: avoid remarking contents of module installname map
2 parents ccfea08 + 792e4aa commit fe74c86

File tree

4 files changed

+0
-35
lines changed

4 files changed

+0
-35
lines changed

include/swift/AST/DiagnosticsFrontend.def

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,6 @@ ERROR(batch_scan_input_file_corrupted,none,
288288
"batch dependencies scan input file from %0 is malformed",
289289
(StringRef))
290290

291-
REMARK(default_previous_install_name, none,
292-
"default previous install name for %0 is %1", (StringRef, StringRef))
293-
294-
REMARK(platform_previous_install_name, none,
295-
"previous install name for %0 in %1 is %2", (StringRef, StringRef, StringRef))
296-
297291
ERROR(unknown_platform_name, none,
298292
"unkown platform name %0", (StringRef))
299293

lib/TBDGen/TBDGen.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,6 @@ StringRef InstallNameStore::getInstallName(LinkerPlatformId Id) const {
125125
return It->second;
126126
}
127127

128-
void InstallNameStore::remark(ASTContext &Ctx, StringRef ModuleName) const {
129-
Ctx.Diags.diagnose(SourceLoc(), diag::default_previous_install_name,
130-
ModuleName, InstallName);
131-
for (auto Pair: PlatformInstallName) {
132-
Ctx.Diags.diagnose(SourceLoc(), diag::platform_previous_install_name,
133-
ModuleName, getLinkerPlatformName(Pair.first),
134-
Pair.second);
135-
}
136-
}
137-
138128
static std::string getScalaNodeText(Node *N) {
139129
SmallString<32> Buffer;
140130
return cast<ScalarNode>(N)->getValue(Buffer).str();
@@ -214,11 +204,6 @@ TBDGenVisitor::parsePreviousModuleInstallNameMap() {
214204
std::unique_ptr<std::map<std::string, InstallNameStore>> pResult(
215205
new std::map<std::string, InstallNameStore>());
216206
auto &AllInstallNames = *pResult;
217-
SWIFT_DEFER {
218-
for (auto Pair: AllInstallNames) {
219-
Pair.second.remark(Ctx, Pair.first);
220-
}
221-
};
222207

223208
// Load the input file.
224209
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =

lib/TBDGen/TBDGenVisitor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ struct InstallNameStore {
5858
// the default install name.
5959
std::map<uint8_t, std::string> PlatformInstallName;
6060
StringRef getInstallName(LinkerPlatformId Id) const;
61-
void remark(ASTContext &Ctx, StringRef ModuleName) const;
6261
};
6362

6463
/// A set of callbacks for recording APIs.

test/TBD/previous-install-name-map.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)