Skip to content

[gardening] Fix partiion^H^H^H^H^Hitions^H^H^H^H^H^Htitions. #6438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2016
Merged

[gardening] Fix partiion^H^H^H^H^Hitions^H^H^H^H^H^Htitions. #6438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions lib/IRGen/AllocStackHoisting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Partition {
Partition() {}

/// Assign a single alloc_stack instruction to all the alloc_stacks in the
/// partiion.
/// partition.
///
/// This assumes that the live ranges of the alloc_stack instructions are
/// non-overlapping.
Expand Down Expand Up @@ -111,7 +111,7 @@ insertDeallocStackAtEndOf(SmallVectorImpl<SILInstruction *> &FunctionExits,
}

/// Assign a single alloc_stack instruction to all the alloc_stacks in the
/// partiion.
/// partition.
void Partition::assignStackLocation(
SmallVectorImpl<SILInstruction *> &FunctionExits) {
assert(!Elts.empty() && "Must have a least one location");
Expand Down Expand Up @@ -262,14 +262,14 @@ void MergeStackSlots::mergeSlots() {
for (auto &PartitionOfOneType : PartitionByType) {
Liveness Live(PartitionOfOneType);

// Paritions that are know to contain non-overlapping alloc_stack
// Partitions that are know to contain non-overlapping alloc_stack
// live-ranges.
SmallVector<Partition, 4> DisjointPartitions(1, Partition());

// Look at all the alloc_stacks of one type.
for (auto *CurAllocStack : PartitionOfOneType.Elts) {
bool FoundAPartition = false;
// Check if we can add it to an existing parition that we have show to be
// Check if we can add it to an existing partition that we have show to be
// non-interfering.
for (auto &CandidateP : DisjointPartitions) {
// If the candidate partition is empty (the very first time we look at an
Expand All @@ -282,8 +282,8 @@ void MergeStackSlots::mergeSlots() {
// Otherwise, we check interference of the current alloc_stack with the
// candidate partition.
bool InterferesWithCandidateP = false;
for (auto *AllocStackInParition : CandidateP.Elts) {
if (Live.mayOverlap(AllocStackInParition, CurAllocStack)) {
for (auto *AllocStackInPartition : CandidateP.Elts) {
if (Live.mayOverlap(AllocStackInPartition, CurAllocStack)) {
InterferesWithCandidateP = true;
break;
}
Expand Down