[PECOFF][Driver] Add -heap command line option.

llvm-svn: 183622

diff --git a/lld/include/lld/ReaderWriter/PECOFFTargetInfo.h b/lld/include/lld/ReaderWriter/PECOFFTargetInfo.h
index 99b57de16c0d6c30925a73c183f17a1b6a778acf..80fa4091aaf8a96595e8e34c10b80fccbeb56aa6 100644 (file)
--- a/lld/include/lld/ReaderWriter/PECOFFTargetInfo.h
+++ b/lld/include/lld/ReaderWriter/PECOFFTargetInfo.h
@@ -25,6 +25,8 @@ public:
   PECOFFTargetInfo()
       : _stackReserve(1024 * 1024),
         _stackCommit(4096),
+        _heapReserve(1024 * 1024),
+        _heapCommit(4096),
         _subsystem(llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN),
         _minOSVersion(6, 0) {}
 
@@ -44,11 +46,15 @@ public:
   virtual void addPasses(PassManager &pm) const {}
 
   void setStackReserve(uint64_t size) { _stackReserve = size; }
-  uint64_t getStackReserve() const { return _stackReserve; }
-
   void setStackCommit(uint64_t size) { _stackCommit = size; }
+  uint64_t getStackReserve() const { return _stackReserve; }
   uint64_t getStackCommit() const { return _stackCommit; }
 
+  void setHeapReserve(uint64_t size) { _heapReserve = size; }
+  void setHeapCommit(uint64_t size) { _heapCommit = size; }
+  uint64_t getHeapReserve() const { return _heapReserve; }
+  uint64_t getHeapCommit() const { return _heapCommit; }
+
   void setSubsystem(llvm::COFF::WindowsSubsystem ss) { _subsystem = ss; }
   llvm::COFF::WindowsSubsystem getSubsystem() const { return _subsystem; }
 
@@ -68,6 +74,8 @@ public:
 private:
   uint64_t _stackReserve;
   uint64_t _stackCommit;
+  uint64_t _heapReserve;
+  uint64_t _heapCommit;
   llvm::COFF::WindowsSubsystem _subsystem;
   OSVersion _minOSVersion;
 

diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp
index e67337ccdd5c2e55e3fc51ff9ff875af8109bd72..077003b99463ed195429c8a0dcbef165a1ec5d9f 100644 (file)
--- a/lld/lib/Driver/WinLinkDriver.cpp
+++ b/lld/lib/Driver/WinLinkDriver.cpp
@@ -78,23 +78,47 @@ bool checkNumber(StringRef version, const char *errorMessage,
   return true;
 }
 
-// Parse -stack command line option. The form of the option is
-// "-stack:stackReserveSize[,stackCommitSize]".
-bool parseStackOption(PECOFFTargetInfo &info, const StringRef &arg,
-                      raw_ostream &diagnostics) {
-  StringRef reserve, commit;
-  llvm::tie(reserve, commit) = arg.split(',');
-  if (!checkNumber(reserve, "invalid stack size: ", diagnostics))
+// Parse an argument for -stack or -heap. The expected string is
+// "reserveSize[,stackCommitSize]".
+bool parseMemoryOption(const StringRef &arg, raw_ostream &diagnostics,
+                       uint64_t &reserve, uint64_t &commit) {
+  StringRef reserveStr, commitStr;
+  llvm::tie(reserveStr, commitStr) = arg.split(',');
+  if (!checkNumber(reserveStr, "invalid stack size: ", diagnostics))
     return false;
-  info.setStackReserve(atoi(reserve.str().c_str()));
-  if (!commit.empty()) {
-    if (!checkNumber(commit, "invalid stack size: ", diagnostics))
+  reserve = atoi(reserveStr.str().c_str());
+  if (!commitStr.empty()) {
+    if (!checkNumber(commitStr, "invalid stack size: ", diagnostics))
       return false;
-    info.setStackCommit(atoi(commit.str().c_str()));
+    commit = atoi(commitStr.str().c_str());
   }
   return true;
 }
 
+// Parse -stack command line option
+bool parseStackOption(PECOFFTargetInfo &info, const StringRef &arg,
+                      raw_ostream &diagnostics) {
+  uint64_t reserve;
+  uint64_t commit = info.getStackCommit();
+  if (!parseMemoryOption(arg, diagnostics, reserve, commit))
+    return false;
+  info.setStackReserve(reserve);
+  info.setStackCommit(commit);
+  return true;
+}
+
+// Parse -heap command line option.
+bool parseHeapOption(PECOFFTargetInfo &info, const StringRef &arg,
+                     raw_ostream &diagnostics) {
+  uint64_t reserve;
+  uint64_t commit = info.getHeapCommit();
+  if (!parseMemoryOption(arg, diagnostics, reserve, commit))
+    return false;
+  info.setHeapReserve(reserve);
+  info.setHeapCommit(commit);
+  return true;
+}
+
 // Returns subsystem type for the given string.
 llvm::COFF::WindowsSubsystem stringToWinSubsystem(StringRef str) {
   std::string arg(str.lower());
@@ -216,6 +240,11 @@ bool WinLinkDriver::parse(int argc, const char *argv[],
     if (!parseStackOption(info, arg->getValue(), diagnostics))
       return true;
 
+  // Handle -heap
+  if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_heap))
+    if (!parseHeapOption(info, arg->getValue(), diagnostics))
+      return true;
+
   // Handle -subsystem
   if (llvm::opt::Arg *arg = parsedArgs->getLastArg(OPT_subsystem))
     if (!parseSubsystemOption(info, arg->getValue(), diagnostics))

diff --git a/lld/lib/Driver/WinLinkOptions.td b/lld/lib/Driver/WinLinkOptions.td
index 850814ae6f67be81167a9f7be7bb9c5c47b1ac12..ce92ac55a426f29457fa7e3182293f5bc1f3b977 100644 (file)
--- a/lld/lib/Driver/WinLinkOptions.td
+++ b/lld/lib/Driver/WinLinkOptions.td
@@ -13,6 +13,10 @@ def stack : Separate<["-", "/"], "stack">,
     HelpText<"Size of the stack">;
 def stack_c: Joined<["-", "/"], "stack:">, Alias<stack>;
 
+def heap : Separate<["-", "/"], "heap">,
+    HelpText<"Size of the heap">;
+def heap_c: Joined<["-", "/"], "heap:">, Alias<heap>;
+
 def subsystem : Separate<["-", "/"], "subsystem">,
     HelpText<"Specify subsystem">;
 def subsystem_c: Joined<["-", "/"], "subsystem:">, Alias<subsystem>;

diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp
index a4c3e7ec4abbb20e1bccefe73a9703819b7528a2..e4bdf5a34793e42879fe812280d8bf3efddf2d3d 100644 (file)
--- a/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/PECOFFTargetInfo.cpp
@@ -30,6 +30,13 @@ bool PECOFFTargetInfo::validate(raw_ostream &diagnostics) {
     return true;
   }
 
+  if (_heapReserve < _heapCommit) {
+    diagnostics << "Invalid heap size: reserve size must be equal to or "
+                << "greater than commit size, but got "
+                << _heapCommit << " and " << _heapReserve << ".\n";
+    return true;
+  }
+
   _reader = createReaderPECOFF(*this);
   _writer = createWriterPECOFF(*this);
   return false;

diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
index f8e4ae9f13d8f4834df2b8fc9d3e88e28340d793..d25f7990e98e16023a6a1f3a15d16440572605e3 100644 (file)
--- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
@@ -157,8 +157,8 @@ public:
 
     _peHeader.SizeOfStackReserve = targetInfo.getStackReserve();
     _peHeader.SizeOfStackCommit = targetInfo.getStackCommit();
-    _peHeader.SizeOfHeapReserve = 0x100000;
-    _peHeader.SizeOfHeapCommit = 0x1000;
+    _peHeader.SizeOfHeapReserve = targetInfo.getHeapReserve();
+    _peHeader.SizeOfHeapCommit = targetInfo.getHeapCommit();
 
     // The number of data directory entries. We always have 16 entries.
     _peHeader.NumberOfRvaAndSize = 16;

diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
index fc05e42c9249b7bcd02059c8de8f663ce0a07f61..1ad60f95d644581ef6f82a8649001e115e0ff16f 100644 (file)
--- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp
+++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
@@ -96,4 +96,16 @@ TEST_F(WinLinkParserTest, StackReserveAndCommit) {
   EXPECT_EQ(16384, info->getStackReserve());
   EXPECT_EQ(8192, info->getStackCommit());
 }
+
+TEST_F(WinLinkParserTest, HeapReserve) {
+  parse("link.exe", "-heap", "8192", nullptr);
+  EXPECT_EQ(8192, info->getHeapReserve());
+  EXPECT_EQ(4096, info->getHeapCommit());
+}
+
+TEST_F(WinLinkParserTest, HeapReserveAndCommit) {
+  parse("link.exe", "-heap", "16384,8192", nullptr);
+  EXPECT_EQ(16384, info->getHeapReserve());
+  EXPECT_EQ(8192, info->getHeapCommit());
+}
 }  // end anonymous namespace