[GlobalISel] Combiner: Install Observer into MachineFunction #102156
Merged
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
|
@llvm/pr-subscribers-llvm-globalisel Author: Tobias Stadler (tobias-stadler) ChangesThe Combiner doesn't install the Observer into the MachineFunction. Full diff: https://github.com/llvm/llvm-project/pull/102156.diff 1 Files Affected:
diff --git a/llvm/lib/CodeGen/GlobalISel/Combiner.cpp b/llvm/lib/CodeGen/GlobalISel/Combiner.cpp
index 3310ce5455c97..5da9e86b20761 100644
--- a/llvm/lib/CodeGen/GlobalISel/Combiner.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/Combiner.cpp
@@ -153,7 +153,7 @@ bool Combiner::combineMachineInstrs() {
// down RPOT.
Changed = false;
- RAIIDelegateInstaller DelInstall(MF, ObserverWrapper.get());
+ RAIIMFObsDelInstaller DelInstall(MF, *ObserverWrapper);
for (MachineBasicBlock *MBB : post_order(&MF)) {
for (MachineInstr &CurMI :
llvm::make_early_inc_range(llvm::reverse(*MBB))) {
|
Created using spr 1.3.6-bogner-wip
aemerson
approved these changes
Aug 7, 2024
Good catch. I have put up #102379. Those were the last improper uses of RAIIDelegateInstaller. |
tobias-stadler
deleted the
users/tobias-stadler/spr/globalisel-combiner-install-observer-into-machinefunction
branch
tobias-stadler
added a commit
that referenced
this pull request
Aug 13, 2024
Similar to #102156. runOnMachineFunction() installs the Observer correctly manually. finishPendingPhis() doesn't install into the MF, but this currently can't cause issues because DILocationVerifier doesn't care about changed instructions. Switch to RAIIMFObsDelInstaller in both places for consistency.
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.
The Combiner doesn't install the Observer into the MachineFunction.
This probably went unnoticed, because MachineFunction::getObserver() is
currently only used in constrainOperandRegClass(), but this might cause
issues down the line.