diff --git a/bolt/lib/Passes/IdenticalCodeFolding.cpp b/bolt/lib/Passes/IdenticalCodeFolding.cpp --- a/bolt/lib/Passes/IdenticalCodeFolding.cpp +++ b/bolt/lib/Passes/IdenticalCodeFolding.cpp @@ -32,9 +32,9 @@ extern cl::OptionCategory BoltOptCategory; -static cl::opt UseDFS("icf-dfs", - cl::desc("use DFS ordering when using -icf option"), - cl::ReallyHidden, cl::cat(BoltOptCategory)); +static cl::opt + ICFUseDFS("icf-dfs", cl::desc("use DFS ordering when using -icf option"), + cl::ReallyHidden, cl::cat(BoltOptCategory)); static cl::opt TimeICF("time-icf", @@ -170,7 +170,7 @@ // Process both functions in either DFS or existing order. SmallVector OrderA; SmallVector OrderB; - if (opts::UseDFS) { + if (opts::ICFUseDFS) { copy(A.dfs(), std::back_inserter(OrderA)); copy(B.dfs(), std::back_inserter(OrderB)); } else { @@ -360,7 +360,7 @@ // Pre-compute hash before pushing into hashtable. // Hash instruction operands to minimize hash collisions. - BF.computeHash(opts::UseDFS, [&BC](const MCOperand &Op) { + BF.computeHash(opts::ICFUseDFS, [&BC](const MCOperand &Op) { return hashInstOperand(BC, Op); }); };