[llvm] cac5d0e - [CodeGen] Fix compiler conditional combination (#94297)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 3 18:16:03 PDT 2024
Author: Keith Smiley
Date: 2024-06-04T09:16:00+08:00
New Revision: cac5d0e938da83ef627a6a8e3f39a47d54516626
URL: https://github.com/llvm/llvm-project/commit/cac5d0e938da83ef627a6a8e3f39a47d54516626
DIFF: https://github.com/llvm/llvm-project/commit/cac5d0e938da83ef627a6a8e3f39a47d54516626.diff
LOG: [CodeGen] Fix compiler conditional combination (#94297)
Previously this assumed that `LLVM_ENABLE_ABI_BREAKING_CHECKS` would
always be enabled in this case, if it's not `TTI` does not exist.
Introduced in 7652a59407018c057cdc1163c9f64b5b6f0954eb
Added:
Modified:
llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 91e14af190257..31ba833abe29d 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -536,7 +536,7 @@ void SelectionDAGISel::initializeAnalysisResults(
SP = &FAM.getResult<SSPLayoutAnalysis>(Fn);
-#ifndef NDEBUG
+#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
TTI = &FAM.getResult<TargetIRAnalysis>(Fn);
#endif
}
@@ -590,7 +590,7 @@ void SelectionDAGISel::initializeAnalysisResults(MachineFunctionPass &MFP) {
SP = &MFP.getAnalysis<StackProtector>().getLayoutInfo();
-#ifndef NDEBUG
+#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS
TTI = &MFP.getAnalysis<TargetTransformInfoWrapperPass>().getTTI(Fn);
#endif
}
More information about the llvm-commits
mailing list