Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ pythonenv*
/clang/utils/analyzer/projects/*/RefScanBuildResults
# automodapi puts generated documentation files here.
/lldb/docs/python_api/
build/
1 change: 0 additions & 1 deletion llvm/lib/Target/WebAssembly/WebAssemblySpillPointers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class WebAssemblySpillPointers final : public MachineFunctionPass {
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.setPreservesCFG();
AU.addRequired<LiveIntervals>();
AU.addPreserved<LiveIntervals>();
MachineFunctionPass::getAnalysisUsage(AU);
}

Expand Down
10 changes: 5 additions & 5 deletions llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,11 @@ void WebAssemblyPassConfig::addPostRegAlloc() {
// control flow.
disablePass(&MachineBlockPlacementID);

// Spill pointer-typed values to shadow stack for GC.
// This must run before PEI so that frame indices are properly resolved.
if (getOptLevel() != CodeGenOpt::None)
addPass(createWebAssemblySpillPointers());

TargetPassConfig::addPostRegAlloc();
}

Expand Down Expand Up @@ -568,11 +573,6 @@ void WebAssemblyPassConfig::addPreEmitPass() {
addPass(createWebAssemblyRegColoring());
}

// Spill pointer-typed values to shadow stack for GC.
// This must run after register allocation but before explicit locals.
if (getOptLevel() != CodeGenOpt::None)
addPass(createWebAssemblySpillPointers());

// Sort the blocks of the CFG into topological order, a prerequisite for
// BLOCK and LOOP markers.
addPass(createWebAssemblyCFGSort());
Expand Down