From 6b977dc43bf1036cae8813c0d0f307557f48583a Mon Sep 17 00:00:00 2001 From: Nate Chandler Date: Mon, 21 Apr 2025 17:51:16 -0700 Subject: [PATCH] [NFC] OSSACanOwned: Renamed field. --- include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h | 4 ++-- lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h b/include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h index 2595baf82dc..9e930144ad6 100644 --- a/include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h +++ b/include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h @@ -261,7 +261,7 @@ private: SILValue currentDef; /// Instructions beyond which liveness is not extended by destroy uses. - ArrayRef currentLexicalLifetimeEnds; + ArrayRef explicitLifetimeEnds; /// Original points in the CFG where the current value's lifetime is consumed /// or destroyed. Each block either contains a consuming instruction (e.g. @@ -368,7 +368,7 @@ public: clear(); currentDef = def; - currentLexicalLifetimeEnds = lexicalLifetimeEnds; + explicitLifetimeEnds = lexicalLifetimeEnds; liveness->initializeDiscoveredBlocks(&discoveredBlocks); liveness->initializeDef(getCurrentDef()); diff --git a/lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp b/lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp index 813d58d326f..d5b11e1d4b4 100644 --- a/lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp +++ b/lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp @@ -387,9 +387,9 @@ void CanonicalizeOSSALifetime::extendLivenessToDeadEnds() { void CanonicalizeOSSALifetime::extendLivenessToDeinitBarriers() { SmallVector ends; - if (currentLexicalLifetimeEnds.size() > 0) { + if (explicitLifetimeEnds.size() > 0) { visitExtendedUnconsumedBoundary( - currentLexicalLifetimeEnds, + explicitLifetimeEnds, [&ends](auto *instruction, auto lifetimeEnding) { instruction->visitSubsequentInstructions([&](auto *next) { ends.push_back(next);