Skip to content

[CodeGen] Building error introduced by commit c53cbce #56754

@maurossi

Description

@maurossi

In commit c53cbce [CodeGen] Define ABI breaking class members correctly
some identifiers declared inside #ifndef NDEBUG/#endif bracing were not
correctly changed to #if LLVM_ENABLE_ABI_BREAKING_CHECKS/#endif bracing,
causing the building error:

external/llvm-project/llvm/lib/CodeGen/MachineScheduler.cpp:754:29: error: use of undeclared identifier 'MISchedCutoff'
  if (NumInstrsScheduled == MISchedCutoff && MISchedCutoff != ~0U) {
                            ^
external/llvm-project/llvm/lib/CodeGen/MachineScheduler.cpp:754:46: error: use of undeclared identifier 'MISchedCutoff'
  if (NumInstrsScheduled == MISchedCutoff && MISchedCutoff != ~0U) {
                                             ^
2 errors generated.

The following diff is required to be able to build libLLVMCodeGen

diff --git a/llvm/lib/CodeGen/MachineScheduler.cpp b/llvm/lib/CodeGen/MachineScheduler.cpp
index 96131dc2983e..c25a8a9ab1bc 100644
--- a/llvm/lib/CodeGen/MachineScheduler.cpp
+++ b/llvm/lib/CodeGen/MachineScheduler.cpp
@@ -102,7 +102,7 @@ const bool PrintDAGs = false;
 
 } // end namespace llvm
 
-#ifndef NDEBUG
+#if LLVM_ENABLE_ABI_BREAKING_CHECKS
 /// In some situations a few uninteresting nodes depend on nearly all other
 /// nodes in the graph, provide a cutoff to hide them.
 static cl::opt<unsigned> ViewMISchedCutoff("view-misched-cutoff", cl::Hidden,
@@ -115,7 +115,7 @@ static cl::opt<std::string> SchedOnlyFunc("misched-only-func", cl::Hidden,
   cl::desc("Only schedule this function"));
 static cl::opt<unsigned> SchedOnlyBlock("misched-only-block", cl::Hidden,
                                         cl::desc("Only schedule this MBB#"));
-#endif // NDEBUG
+#endif
 
 /// Avoid quadratic complexity in unusually large basic blocks by limiting the
 /// size of the ready lists.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    Status

    Done

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions