Skip to content

Commit 3f335e8

Browse files
committed
Address comments from thevinster
1 parent 7b14e95 commit 3f335e8

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

llvm/lib/CodeGen/GlobalMergeFunctions.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
using namespace llvm;
2626
using namespace llvm::support;
2727

28-
static cl::opt<bool>
29-
DisableGlobalMerging("disable-global-merging", cl::Hidden,
30-
cl::desc("Disable global merging only by ignoring "
31-
"the codegen data generation or use. Local "
32-
"merging is still enabled within a module."),
33-
cl::init(false));
28+
static cl::opt<bool> DisableCGDataForMerging(
29+
"disable-cgdata-for-merging", cl::Hidden,
30+
cl::desc("Disable codegen data for function merging. Local "
31+
"merging is still enabled within a module."),
32+
cl::init(false));
3433

3534
STATISTIC(NumMismatchedFunctionHash,
3635
"Number of mismatched function hash for global merge function");
@@ -562,8 +561,8 @@ void GlobalMergeFunc::initializeMergerMode(const Module &M) {
562561
// Initialize the local function map regardless of the merger mode.
563562
LocalFunctionMap = std::make_unique<StableFunctionMap>();
564563

565-
// Skip the global merge mode. The local merge is still enabled.
566-
if (DisableGlobalMerging)
564+
// Disable codegen data for merging. The local merge is still enabled.
565+
if (DisableCGDataForMerging)
567566
return;
568567

569568
// (Full)LTO module does not have functions added to the index.

0 commit comments

Comments
 (0)