This is an archive of the discontinued LLVM Phabricator instance.

Differential D62933

[lld] Allow args::getInterger to parse args larger than 2^31-1
ClosedPublic

Authored by sbc100 on Jun 5 2019, 2:38 PM.

Details

Reviewers
ruiu
Commits
rG53211aa9f130: [lld] Allow args::getInterger to parse args larger than 2^31-1
rL362770: [lld] Allow args::getInterger to parse args larger than 2^31-1
rLLD362770: [lld] Allow args::getInterger to parse args larger than 2^31-1

Diff Detail

Repository
rL LLVM

Event Timeline

sbc100 created this revision.Jun 5 2019, 2:38 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 5 2019, 2:38 PM
Herald added subscribers: llvm-commits, aheejin. · View Herald Transcript
sbc100 added a reviewer: ruiu.Jun 5 2019, 2:38 PM
sbc100 updated this revision to Diff 203253.Jun 5 2019, 2:39 PM
  • cleanup test
Harbormaster completed remote builds in B32961: Diff 203252.Jun 5 2019, 2:41 PM
Harbormaster completed remote builds in B32962: Diff 203253.
ruiu accepted this revision.Jun 5 2019, 8:26 PM

LGTM

This revision is now accepted and ready to land.Jun 5 2019, 8:26 PM
Closed by commit rL362770: [lld] Allow args::getInterger to parse args larger than 2^31-1 (authored by sbc). · Explain WhyJun 6 2019, 11:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
Common/
5 lines
include/
lld/
Common/
3 lines
test/
wasm/
5 lines

Diff 203499

lld/trunk/Common/Args.cpp

Show All 20 Lines
// function metadata. // function metadata.
CodeGenOpt::Level lld::args::getCGOptLevel(int OptLevelLTO) { CodeGenOpt::Level lld::args::getCGOptLevel(int OptLevelLTO) {
if (OptLevelLTO == 3) if (OptLevelLTO == 3)
return CodeGenOpt::Aggressive; return CodeGenOpt::Aggressive;
assert(OptLevelLTO < 3); assert(OptLevelLTO < 3);
return CodeGenOpt::Default; return CodeGenOpt::Default;
} }
int lld::args::getInteger(opt::InputArgList &Args, unsigned Key, int Default) { int64_t lld::args::getInteger(opt::InputArgList &Args, unsigned Key,
int64_t Default) {
auto *A = Args.getLastArg(Key); auto *A = Args.getLastArg(Key);
if (!A) if (!A)
return Default; return Default;
int V; int64_t V;
if (to_integer(A->getValue(), V, 10)) if (to_integer(A->getValue(), V, 10))
return V; return V;
StringRef Spelling = Args.getArgString(A->getIndex()); StringRef Spelling = Args.getArgString(A->getIndex());
error(Spelling + ": number expected, but got '" + A->getValue() + "'"); error(Spelling + ": number expected, but got '" + A->getValue() + "'");
return 0; return 0;
} }
Show All 39 Lines

lld/trunk/include/lld/Common/Args.h

Show All 19 Lines
} }
} // namespace llvm } // namespace llvm
namespace lld { namespace lld {
namespace args { namespace args {
llvm::CodeGenOpt::Level getCGOptLevel(int OptLevelLTO); llvm::CodeGenOpt::Level getCGOptLevel(int OptLevelLTO);
int getInteger(llvm::opt::InputArgList &Args, unsigned Key, int Default); int64_t getInteger(llvm::opt::InputArgList &Args, unsigned Key,
int64_t Default);
std::vector<StringRef> getStrings(llvm::opt::InputArgList &Args, int Id); std::vector<StringRef> getStrings(llvm::opt::InputArgList &Args, int Id);
uint64_t getZOptionValue(llvm::opt::InputArgList &Args, int Id, StringRef Key, uint64_t getZOptionValue(llvm::opt::InputArgList &Args, int Id, StringRef Key,
uint64_t Default); uint64_t Default);
std::vector<StringRef> getLines(MemoryBufferRef MB); std::vector<StringRef> getLines(MemoryBufferRef MB);
StringRef getFilenameWithoutExe(StringRef Path); StringRef getFilenameWithoutExe(StringRef Path);
} // namespace args } // namespace args
} // namespace lld } // namespace lld
#endif #endif

lld/trunk/test/wasm/large-memory.test

RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.o
; Verify we can parse large integers such as when we ask for 2G of total
; memory.
RUN: wasm-ld %t.o -o %t.wasm --max-memory=2147483648