From 2471073a0bf0f8dd545acd32b0d5174931dfee95 Mon Sep 17 00:00:00 2001
From: Mitch Phillips <mitchphillips@outlook.com>
Date: Wed, 1 Nov 2017 23:39:41 +0000
Subject: Update cl::opt<uint64_t> instances to cl::opt<unsigned long long>

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

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

Reviewers: pcc

Subscribers: mgorny, llvm-commits, kcc

Differential Revision: https://reviews.llvm.org/D38657

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317141 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-cfi-verify/lib/GraphBuilder.cpp | 8 ++++----
 tools/llvm-cfi-verify/lib/GraphBuilder.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/llvm-cfi-verify/lib/GraphBuilder.cpp b/tools/llvm-cfi-verify/lib/GraphBuilder.cpp
index 808b9927fcc..7366ff0cf30 100644
--- a/tools/llvm-cfi-verify/lib/GraphBuilder.cpp
+++ b/tools/llvm-cfi-verify/lib/GraphBuilder.cpp
@@ -41,17 +41,17 @@ using Instr = llvm::cfi_verify::FileAnalysis::Instr;
 namespace llvm {
 namespace cfi_verify {
 
-uint64_t SearchLengthForUndef;
-uint64_t SearchLengthForConditionalBranch;
+unsigned long long SearchLengthForUndef;
+unsigned long long SearchLengthForConditionalBranch;
 
-static cl::opt<uint64_t, true> SearchLengthForUndefArg(
+static cl::opt<unsigned long long, true> SearchLengthForUndefArg(
     "search-length-undef",
     cl::desc("Specify the maximum amount of instructions "
              "to inspect when searching for an undefined "
              "instruction from a conditional branch."),
     cl::location(SearchLengthForUndef), cl::init(2));
 
-static cl::opt<uint64_t, true> SearchLengthForConditionalBranchArg(
+static cl::opt<unsigned long long, true> SearchLengthForConditionalBranchArg(
     "search-length-cb",
     cl::desc("Specify the maximum amount of instructions "
              "to inspect when searching for a conditional "
diff --git a/tools/llvm-cfi-verify/lib/GraphBuilder.h b/tools/llvm-cfi-verify/lib/GraphBuilder.h
index 3536520d590..12d9c95e3cf 100644
--- a/tools/llvm-cfi-verify/lib/GraphBuilder.h
+++ b/tools/llvm-cfi-verify/lib/GraphBuilder.h
@@ -47,8 +47,8 @@ using Instr = llvm::cfi_verify::FileAnalysis::Instr;
 namespace llvm {
 namespace cfi_verify {
 
-extern uint64_t SearchLengthForUndef;
-extern uint64_t SearchLengthForConditionalBranch;
+extern unsigned long long SearchLengthForUndef;
+extern unsigned long long SearchLengthForConditionalBranch;
 
 struct ConditionalBranchNode {
   uint64_t Address;
-- 
cgit v1.2.3