[lld] r213804 - [PECOFF] Add the entry point file at the right place.
Rui Ueyama
ruiu at google.com
Wed Jul 23 14:41:20 PDT 2014
Author: ruiu
Date: Wed Jul 23 16:41:20 2014
New Revision: 213804
URL: http://llvm.org/viewvc/llvm-project?rev=213804&view=rev
Log:
[PECOFF] Add the entry point file at the right place.
The entry point file needs to be processed after all other
object files and before all .lib files. It was processed
after .lib files. That caused an issue that the entry point
function was not resolved from the standard library files.
Modified:
lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
lld/trunk/lib/Driver/WinLinkDriver.cpp
lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
Modified: lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=213804&r1=213803&r2=213804&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h (original)
+++ lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h Wed Jul 23 16:41:20 2014
@@ -277,6 +277,9 @@ public:
virtual bool hasInputGraph() { return !!_inputGraph; }
+ void setEntryNode(SimpleFileNode *node) { _entryNode = node; }
+ SimpleFileNode *getEntryNode() const { return _entryNode; }
+
void setLibraryGroup(Group *group) { _libraryGroup = group; }
Group *getLibraryGroup() const { return _libraryGroup; }
@@ -387,6 +390,9 @@ private:
// Microsoft Windows." This feature was somewhat useful before Windows 95.
ArrayRef<uint8_t> _dosStub;
+ // The node containing the entry point file.
+ SimpleFileNode *_entryNode;
+
// The PECOFFGroup that contains all the .lib files.
Group *_libraryGroup;
Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=213804&r1=213803&r2=213804&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Wed Jul 23 16:41:20 2014
@@ -1315,7 +1315,13 @@ bool WinLinkDriver::parse(int argc, cons
// Add the library group to the input graph.
if (!isReadingDirectiveSection) {
- auto group = std::unique_ptr<Group>(new PECOFFGroup(ctx));
+ // The container for the entry point file.
+ std::unique_ptr<SimpleFileNode> entry(new SimpleFileNode("<entry>"));
+ ctx.setEntryNode(entry.get());
+ ctx.getInputGraph().addInputElement(std::move(entry));
+
+ // The container for all library files.
+ std::unique_ptr<Group> group(new PECOFFGroup(ctx));
ctx.setLibraryGroup(group.get());
ctx.getInputGraph().addInputElement(std::move(group));
}
Modified: lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=213804&r1=213803&r2=213804&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp Wed Jul 23 16:41:20 2014
@@ -129,11 +129,8 @@ bool PECOFFLinkingContext::createImplici
getLibraryGroup()->addFile(std::move(exportNode));
// Create a file for the entry point function.
- std::unique_ptr<SimpleFileNode> entryFileNode(new SimpleFileNode("<entry>"));
- entryFileNode->appendInputFile(
+ getEntryNode()->appendInputFile(
std::unique_ptr<File>(new pecoff::EntryPointFile(*this, syms)));
- getInputGraph().insertElementAt(std::move(entryFileNode),
- InputGraph::Position::END);
return true;
}
Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=213804&r1=213803&r2=213804&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Wed Jul 23 16:41:20 2014
@@ -39,7 +39,7 @@ TEST_F(WinLinkParserTest, Basic) {
EXPECT_EQ(llvm::COFF::IMAGE_FILE_MACHINE_I386, _context.getMachineType());
EXPECT_EQ("a.exe", _context.outputPath());
EXPECT_EQ("start", _context.getEntrySymbolName());
- EXPECT_EQ(4, inputFileCount());
+ EXPECT_EQ(5, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
EXPECT_EQ("b.obj", inputFile(1));
EXPECT_EQ("c.obj", inputFile(2));
@@ -79,7 +79,7 @@ TEST_F(WinLinkParserTest, StartsWithHyph
parse("link.exe", "-subsystem:console", "-out:a.exe", "a.obj", nullptr));
EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI, _context.getSubsystem());
EXPECT_EQ("a.exe", _context.outputPath());
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
}
@@ -88,7 +88,7 @@ TEST_F(WinLinkParserTest, UppercaseOptio
parse("link.exe", "/SUBSYSTEM:CONSOLE", "/OUT:a.exe", "a.obj", nullptr));
EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI, _context.getSubsystem());
EXPECT_EQ("a.exe", _context.outputPath());
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
}
@@ -111,7 +111,7 @@ TEST_F(WinLinkParserTest, NoInputFiles)
TEST_F(WinLinkParserTest, NoFileExtension) {
EXPECT_TRUE(parse("link.exe", "foo", "bar", nullptr));
EXPECT_EQ("foo.exe", _context.outputPath());
- EXPECT_EQ(3, inputFileCount());
+ EXPECT_EQ(4, inputFileCount());
EXPECT_EQ("foo.obj", inputFile(0));
EXPECT_EQ("bar.obj", inputFile(1));
}
@@ -119,7 +119,7 @@ TEST_F(WinLinkParserTest, NoFileExtensio
TEST_F(WinLinkParserTest, NonStandardFileExtension) {
EXPECT_TRUE(parse("link.exe", "foo.o", nullptr));
EXPECT_EQ("foo.exe", _context.outputPath());
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("foo.o", inputFile(0));
}
@@ -139,11 +139,11 @@ TEST_F(WinLinkParserTest, Libpath) {
TEST_F(WinLinkParserTest, InputOrder) {
EXPECT_TRUE(parse("link.exe", "a.lib", "b.obj", "c.obj", "a.lib", "d.obj",
nullptr));
- EXPECT_EQ(4, inputFileCount());
+ EXPECT_EQ(5, inputFileCount());
EXPECT_EQ("b.obj", inputFile(0));
EXPECT_EQ("c.obj", inputFile(1));
EXPECT_EQ("d.obj", inputFile(2));
- EXPECT_EQ("a.lib", inputFile(3, 0));
+ EXPECT_EQ("a.lib", inputFile(4, 0));
}
//
@@ -395,33 +395,33 @@ TEST_F(WinLinkParserTest, SectionMultipl
TEST_F(WinLinkParserTest, DefaultLib) {
EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
"/defaultlib:kernel32", "a.obj", nullptr));
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
- EXPECT_EQ("user32.lib", inputFile(1, 0));
- EXPECT_EQ("kernel32.lib", inputFile(1, 1));
+ EXPECT_EQ("user32.lib", inputFile(2, 0));
+ EXPECT_EQ("kernel32.lib", inputFile(2, 1));
}
TEST_F(WinLinkParserTest, DefaultLibDuplicates) {
EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
"/defaultlib:user32.lib", "a.obj", nullptr));
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
- EXPECT_EQ("user32.lib", inputFile(1, 0));
+ EXPECT_EQ("user32.lib", inputFile(2, 0));
}
TEST_F(WinLinkParserTest, NoDefaultLib) {
EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
"/defaultlib:kernel32", "/nodefaultlib:user32.lib", "a.obj",
nullptr));
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
- EXPECT_EQ("kernel32.lib", inputFile(1, 0));
+ EXPECT_EQ("kernel32.lib", inputFile(2, 0));
}
TEST_F(WinLinkParserTest, NoDefaultLibAll) {
EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
"/defaultlib:kernel32", "/nodefaultlib", "a.obj", nullptr));
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
}
@@ -429,9 +429,9 @@ TEST_F(WinLinkParserTest, DisallowLib) {
EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
"/defaultlib:kernel32", "/disallowlib:user32.lib", "a.obj",
nullptr));
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
- EXPECT_EQ("kernel32.lib", inputFile(1, 0));
+ EXPECT_EQ("kernel32.lib", inputFile(2, 0));
}
//
@@ -666,7 +666,7 @@ TEST_F(WinLinkParserTest, Ignore) {
"/ignore:4000", "/ignoreidl", "/implib:foo", "/safeseh",
"/safeseh:no", "/functionpadmin", "a.obj", nullptr));
EXPECT_EQ("", errorMessage());
- EXPECT_EQ(2, inputFileCount());
+ EXPECT_EQ(3, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
}
@@ -679,7 +679,7 @@ TEST_F(WinLinkParserTest, DashDash) {
"--", "b.obj", "-c.obj", nullptr));
EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI, _context.getSubsystem());
EXPECT_EQ("a.exe", _context.outputPath());
- EXPECT_EQ(4, inputFileCount());
+ EXPECT_EQ(5, inputFileCount());
EXPECT_EQ("a.obj", inputFile(0));
EXPECT_EQ("b.obj", inputFile(1));
EXPECT_EQ("-c.obj", inputFile(2));
More information about the llvm-commits
mailing list