[LLD][ELF] Import ObjFile::importCmseSymbols at call site
#68025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Before this patch, with MSVC I was seeing the following warnings: ``` [304/334] Building CXX object tools\lld\ELF\CMakeFiles\lldELF.dir\InputFiles.cpp.obj C:\git\llvm-project\lld\ELF\InputFiles.h(327): warning C4661: 'void lld::elf::ObjFile<llvm::object::ELF32LE>::importCmseSymbols(void)': no suitable definition provided for explicit template instantiation request C:\git\llvm-project\lld\ELF\InputFiles.h(291): note: see declaration of 'lld::elf::ObjFile<llvm::object::ELF32LE>::importCmseSymbols' C:\git\llvm-project\lld\ELF\InputFiles.h(327): warning C4661: 'void lld::elf::ObjFile<llvm::object::ELF32LE>::redirectCmseSymbols(void)': no suitable definition provided for explicit template instantiation request C:\git\llvm-project\lld\ELF\InputFiles.h(292): note: see declaration of 'lld::elf::ObjFile<llvm::object::ELF32LE>::redirectCmseSymbols' ``` This patch removes `redirectCmseSymbols` which is not defined. And it imports `importCmseSymbols` in InputFiles.cpp, because it is already explicitly instantiated in ARM.cpp.
|
@llvm/pr-subscribers-lld @llvm/pr-subscribers-lld-elf ChangesBefore this patch, with MSVC I was seeing the following warnings: This patch removes Full diff: https://github.com/llvm/llvm-project/pull/68025.diff 2 Files Affected:
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index fa0731854689b94..bb86269d49499cd 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -40,6 +40,13 @@ using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
+// This function is explicity instantiated in ARM.cpp, don't do it here to avoid
+// warnings with MSVC.
+extern template void ObjFile<ELF32LE>::importCmseSymbols();
+extern template void ObjFile<ELF32BE>::importCmseSymbols();
+extern template void ObjFile<ELF64LE>::importCmseSymbols();
+extern template void ObjFile<ELF64BE>::importCmseSymbols();
+
bool InputFile::isInGroup;
uint32_t InputFile::nextGroupId;
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index cc658bdc231988e..41c2ba4e307b36b 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -289,7 +289,6 @@ template <class ELFT> class ObjFile : public ELFFileBase {
void initSectionsAndLocalSyms(bool ignoreComdats);
void postParse();
void importCmseSymbols();
- void redirectCmseSymbols();
private:
void initializeSections(bool ignoreComdats,
|
MaskRay
approved these changes
Oct 3, 2023
| @@ -40,6 +40,13 @@ using namespace llvm::support::endian; | |||
| using namespace lld; | |||
| using namespace lld::elf; | |||
|
|
|||
| // This function is explicity instantiated in ARM.cpp, don't do it here to avoid | |||
| // warnings with MSVC. | |||
| extern template void ObjFile<ELF32LE>::importCmseSymbols(); | |||
There was a problem hiding this comment.
This can be placed directly before doParseArmCMSEImportLib for clarity.
aganea
changed the title
ObjFile::importCmseSymbols at point of usage
aganea
changed the title
ObjFile::importCmseSymbols at point of usageObjFile::importCmseSymbols at call site
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this patch, with MSVC I was seeing the following warnings:
This patch removes
redirectCmseSymbolswhich is not defined. And it importsimportCmseSymbolsin InputFiles.cpp, because it is already explicitly instantiated in ARM.cpp.