Revert "[IR] Don't include Module.h in Analysis.h (NFC) (#97023)" #97129
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 4169338.
llvmbot
added
clang
|
@llvm/pr-subscribers-llvm-selectiondag @llvm/pr-subscribers-backend-amdgpu Author: None (ZijunZhaoCCK) ChangesThis reverts commit 4169338. This will causes incomplete type errors. |
|
@llvm/pr-subscribers-backend-powerpc Author: None (ZijunZhaoCCK) ChangesThis reverts commit 4169338. This will causes incomplete type errors. |
You can test this locally with the following command:git-clang-format --diff 0991bd7887a313d4d6bb66ca44d11939ad71b660 e277504246c0f077fec20e917c29ac8e5c193325 -- clang/lib/Interpreter/DeviceOffload.cpp llvm/include/llvm/Analysis/TargetTransformInfo.h llvm/include/llvm/Analysis/VectorUtils.h llvm/include/llvm/IR/Analysis.h llvm/include/llvm/Transforms/IPO/Attributor.h llvm/include/llvm/Transforms/Utils/Debugify.h llvm/lib/Analysis/CallPrinter.cpp llvm/lib/Analysis/InlineAdvisor.cpp llvm/lib/Analysis/LazyValueInfo.cpp llvm/lib/Analysis/LoopInfo.cpp llvm/lib/Analysis/LoopPass.cpp llvm/lib/Analysis/MLInlineAdvisor.cpp llvm/lib/Analysis/StructuralHash.cpp llvm/lib/Analysis/TargetLibraryInfo.cpp llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp llvm/lib/CodeGen/AsmPrinter/AIXException.cpp llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp llvm/lib/CodeGen/AsmPrinter/WinCFGuard.cpp llvm/lib/CodeGen/AssignmentTrackingAnalysis.cpp llvm/lib/CodeGen/CFGuardLongjmp.cpp llvm/lib/CodeGen/EHContGuardCatchret.cpp llvm/lib/CodeGen/GCMetadata.cpp llvm/lib/CodeGen/KCFI.cpp llvm/lib/CodeGen/MachineCheckDebugify.cpp llvm/lib/CodeGen/MachineFunctionPass.cpp llvm/lib/CodeGen/MachineModuleSlotTracker.cpp llvm/lib/CodeGen/RegAllocBase.cpp llvm/lib/CodeGen/RegAllocEvictionAdvisor.cpp llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp llvm/lib/CodeGen/WinEHPrepare.cpp llvm/lib/ExecutionEngine/Orc/JITTargetMachineBuilder.cpp llvm/lib/IR/PassManager.cpp llvm/lib/LTO/UpdateCompilerUsed.cpp llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp llvm/lib/Target/AArch64/AArch64FastISel.cpp llvm/lib/Target/AArch64/AArch64InstrInfo.cpp llvm/lib/Target/AArch64/AArch64TargetObjectFile.cpp llvm/lib/Target/AMDGPU/AMDGPUAliasAnalysis.h llvm/lib/Target/AMDGPU/AMDGPUMachineModuleInfo.cpp llvm/lib/Target/AMDGPU/R600OpenCLImageTypeLoweringPass.cpp llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp llvm/lib/Target/ARM/ARMInstrInfo.cpp llvm/lib/Target/ARM/ARMMachineFunctionInfo.cpp llvm/lib/Target/ARM/Thumb1InstrInfo.cpp llvm/lib/Target/ARM/Thumb2InstrInfo.cpp llvm/lib/Target/AVR/AVRAsmPrinter.cpp llvm/lib/Target/BPF/BPFAsmPrinter.cpp llvm/lib/Target/BPF/BPFMISimplifyPatchable.cpp llvm/lib/Target/BPF/BTFDebug.cpp llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp llvm/lib/Target/Mips/MipsAsmPrinter.cpp llvm/lib/Target/Mips/MipsISelLowering.cpp llvm/lib/Target/PowerPC/PPCMCInstLower.cpp llvm/lib/Target/PowerPC/PPCSubtarget.cpp llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp llvm/lib/Target/RISCV/RISCVInstrInfo.cpp llvm/lib/Target/RISCV/RISCVTargetObjectFile.cpp llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp llvm/lib/Target/SystemZ/SystemZISelLowering.cpp llvm/lib/Target/Target.cpp llvm/lib/Target/TargetMachine.cpp llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp llvm/lib/Target/WebAssembly/WebAssemblyMCLowerPrePass.cpp llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp llvm/lib/Target/X86/X86FrameLowering.cpp llvm/lib/Target/X86/X86ISelDAGToDAG.cpp llvm/lib/Target/X86/X86IndirectBranchTracking.cpp llvm/lib/Target/X86/X86InsertPrefetch.cpp llvm/lib/Target/X86/X86InstrInfo.cpp llvm/lib/Target/X86/X86PreTileConfig.cpp llvm/lib/Target/X86/X86ReturnThunks.cpp llvm/lib/Target/X86/X86Subtarget.cpp llvm/lib/Transforms/IPO/CalledValuePropagation.cpp llvm/lib/Transforms/Instrumentation/LowerAllowCheckPass.cpp llvm/lib/Transforms/Instrumentation/PGOForceFunctionAttrs.cpp llvm/lib/Transforms/Scalar/ConstantHoisting.cpp llvm/lib/Transforms/Scalar/MakeGuardsExplicit.cpp llvm/lib/Transforms/Scalar/PlaceSafepoints.cpp llvm/lib/Transforms/Utils/CanonicalizeAliases.cpp llvm/lib/Transforms/Utils/DemoteRegToStack.cpp llvm/lib/Transforms/Utils/LowerGlobalDtors.cpp llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp llvm/unittests/Analysis/DDGTest.cpp llvm/unittests/Analysis/GlobalsModRefTest.cpp llvm/unittests/Analysis/IVDescriptorsTest.cpp llvm/unittests/Analysis/LoopInfoTest.cpp llvm/unittests/Analysis/LoopNestTest.cpp llvm/unittests/CodeGen/AArch64SelectionDAGTest.cpp llvm/unittests/CodeGen/AMDGPUMetadataTest.cpp llvm/unittests/CodeGen/MLRegAllocDevelopmentFeatures.cpp llvm/unittests/CodeGen/SelectionDAGAddressAnalysisTest.cpp llvm/unittests/CodeGen/SelectionDAGPatternMatchTest.cpp llvm/unittests/MI/LiveIntervalTest.cpp llvm/unittests/MIR/MachineMetadata.cpp llvm/unittests/Target/AArch64/InstSizes.cpp llvm/unittests/Target/ARM/InstSizes.cpp llvm/unittests/Target/LoongArch/InstSizes.cpp llvm/unittests/Target/RISCV/RISCVInstrInfoTest.cpp llvm/unittests/Target/WebAssembly/WebAssemblyExceptionInfoTest.cpp llvm/unittests/Target/X86/MachineSizeOptsTest.cpp llvm/unittests/Transforms/Utils/BasicBlockUtilsTest.cpp llvm/unittests/Transforms/Utils/LoopRotationUtilsTest.cpp llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp llvm/unittests/Transforms/Utils/UnrollLoopTest.cpp polly/lib/Analysis/ScopBuilder.cpp polly/lib/Support/SCEVAffinator.cpp polly/lib/Transform/DeLICM.cppView the diff from clang-format here.diff --git a/llvm/include/llvm/Transforms/Utils/Debugify.h b/llvm/include/llvm/Transforms/Utils/Debugify.h
index 7981b9ec70..68146e55c0 100644
--- a/llvm/include/llvm/Transforms/Utils/Debugify.h
+++ b/llvm/include/llvm/Transforms/Utils/Debugify.h
@@ -19,8 +19,8 @@
#include "llvm/Bitcode/BitcodeWriterPass.h"
#include "llvm/IR/IRPrintingPasses.h"
#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/IR/PassManager.h"
#include "llvm/IR/PassInstrumentation.h"
+#include "llvm/IR/PassManager.h"
#include "llvm/IR/ValueHandle.h"
#include "llvm/Pass.h"
diff --git a/llvm/lib/LTO/UpdateCompilerUsed.cpp b/llvm/lib/LTO/UpdateCompilerUsed.cpp
index 8dff5418de..1f47678623 100644
--- a/llvm/lib/LTO/UpdateCompilerUsed.cpp
+++ b/llvm/lib/LTO/UpdateCompilerUsed.cpp
@@ -15,8 +15,8 @@
#include "llvm/CodeGen/TargetLowering.h"
#include "llvm/CodeGen/TargetSubtargetInfo.h"
#include "llvm/IR/Mangler.h"
-#include "llvm/Transforms/Utils/ModuleUtils.h"
#include "llvm/Target/TargetMachine.h"
+#include "llvm/Transforms/Utils/ModuleUtils.h"
using namespace llvm;
diff --git a/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp b/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
index 61a2031a8f..c0c0c6bcff 100644
--- a/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
+++ b/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
@@ -6,14 +6,14 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Analysis/AssumptionCache.h"
#include "llvm/Analysis/AssumeBundleQueries.h"
+#include "llvm/Analysis/AssumptionCache.h"
#include "llvm/AsmParser/Parser.h"
-#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Regex.h"
#include "llvm/Support/SourceMgr.h"
-#include "llvm/Support/CommandLine.h"
#include "llvm/Transforms/Utils/AssumeBundleBuilder.h"
#include "gtest/gtest.h"
#include <random>
|
|
In what configuration are you seeing these errors? I believe most of the issues got resolved by this morning (PST) for the buildbots. |
|
Please share the cmake config and build command for repro. |
nikic
requested changes
Jun 29, 2024
There was a problem hiding this comment.
This is probably caused by some downstream patches in google3? https://github.com/llvm/llvm-project/blob/main/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp does not contain any mentions of M->getFunction or M->getContext. You need to add the missing include to your downstream patches.
Yes, The problem is from our Android downstream patch, Support-for-WASM-as-native-IR.patch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 4169338.
This causes incomplete type errors.