This is an archive of the discontinued LLVM Phabricator instance.

Differential D38657

Update cl::opt<uint64_t> instances to cl::opt<unsigned long long>
ClosedPublic

Authored by hctim on Oct 6 2017, 5:57 PM.

Details

Reviewers
pcc
Commits
rG4ab6fc0cd61b: Update cl::opt<uint64_t> instances to cl::opt<unsigned long long>
rL317141: Update cl::opt<uint64_t> instances to cl::opt<unsigned long long>
Summary

cl::opt<uint64_t> fails when parsing command line arguments.

See https://bugs.llvm.org/show_bug.cgi?id=19665.

Diff Detail

Event Timeline

hctim created this revision.Oct 6 2017, 5:57 PM
hctim added a parent revision: D38654: Parse DWARF information to reduce false positives..
hctim added a child revision: D38658: [cfi-verify] Add an interesting unit test where undef search length changes result..Oct 6 2017, 6:01 PM
hctim updated this revision to Diff 118429.Oct 10 2017, 10:55 AM

Merged previous changes in the stack.

Herald added a subscriber: mgorny. · View Herald TranscriptOct 10 2017, 10:55 AM
hctim updated this revision to Diff 120504.Oct 26 2017, 3:45 PM

Patched in changes from stack.

Harbormaster completed remote builds in B11547: Diff 120504.Oct 26 2017, 3:45 PM
pcc accepted this revision.Nov 1 2017, 4:35 PM

LGTM, I guess.

Or just use cl::opt<unsigned>.

This revision is now accepted and ready to land.Nov 1 2017, 4:35 PM
hctim updated this revision to Diff 121211.Nov 1 2017, 4:37 PM

Merged master in preparation for submission.

Harbormaster completed remote builds in B11732: Diff 121211.Nov 1 2017, 4:37 PM
Closed by commit rL317141: Update cl::opt<uint64_t> instances to cl::opt<unsigned long long> (authored by hctim). · Explain WhyNov 1 2017, 4:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
tools/
llvm-cfi-verify/
lib/
4 lines
8 lines

Diff 120504

tools/llvm-cfi-verify/lib/GraphBuilder.h

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
using Instr = llvm::cfi_verify::FileAnalysis::Instr; using Instr = llvm::cfi_verify::FileAnalysis::Instr;
namespace llvm { namespace llvm {
namespace cfi_verify { namespace cfi_verify {
extern uint64_t SearchLengthForUndef; extern unsigned long long SearchLengthForUndef;
extern uint64_t SearchLengthForConditionalBranch; extern unsigned long long SearchLengthForConditionalBranch;
struct ConditionalBranchNode { struct ConditionalBranchNode {
uint64_t Address; uint64_t Address;
uint64_t Target; uint64_t Target;
uint64_t Fallthrough; uint64_t Fallthrough;
// Does this conditional branch look like it's used for CFI protection? i.e. // Does this conditional branch look like it's used for CFI protection? i.e.
// - The exit point of a basic block whos entry point is {target|fallthrough} // - The exit point of a basic block whos entry point is {target|fallthrough}
// is a CFI trap, and... // is a CFI trap, and...
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines

tools/llvm-cfi-verify/lib/GraphBuilder.cpp

Show All 35 Lines
#include <functional> #include <functional>
using Instr = llvm::cfi_verify::FileAnalysis::Instr; using Instr = llvm::cfi_verify::FileAnalysis::Instr;
namespace llvm { namespace llvm {
namespace cfi_verify { namespace cfi_verify {
uint64_t SearchLengthForUndef; unsigned long long SearchLengthForUndef;
uint64_t SearchLengthForConditionalBranch; unsigned long long SearchLengthForConditionalBranch;
static cl::opt<uint64_t, true> SearchLengthForUndefArg( static cl::opt<unsigned long long, true> SearchLengthForUndefArg(
"search-length-undef", "search-length-undef",
cl::desc("Specify the maximum amount of instructions " cl::desc("Specify the maximum amount of instructions "
"to inspect when searching for an undefined " "to inspect when searching for an undefined "
"instruction from a conditional branch."), "instruction from a conditional branch."),
cl::location(SearchLengthForUndef), cl::init(2)); cl::location(SearchLengthForUndef), cl::init(2));
static cl::opt<uint64_t, true> SearchLengthForConditionalBranchArg( static cl::opt<unsigned long long, true> SearchLengthForConditionalBranchArg(
"search-length-cb", "search-length-cb",
cl::desc("Specify the maximum amount of instructions " cl::desc("Specify the maximum amount of instructions "
"to inspect when searching for a conditional " "to inspect when searching for a conditional "
"branch from an indirect control flow."), "branch from an indirect control flow."),
cl::location(SearchLengthForConditionalBranch), cl::init(20)); cl::location(SearchLengthForConditionalBranch), cl::init(20));
std::vector<uint64_t> GraphResult::flattenAddress(uint64_t Address) const { std::vector<uint64_t> GraphResult::flattenAddress(uint64_t Address) const {
std::vector<uint64_t> Addresses; std::vector<uint64_t> Addresses;
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines