diff options
Diffstat (limited to 'clang/lib/CodeGen/CGCleanup.h')
-rw-r--r-- | clang/lib/CodeGen/CGCleanup.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/clang/lib/CodeGen/CGCleanup.h b/clang/lib/CodeGen/CGCleanup.h index ffe0f9d9dd209..ef4f6b9ec1332 100644 --- a/clang/lib/CodeGen/CGCleanup.h +++ b/clang/lib/CodeGen/CGCleanup.h @@ -102,7 +102,7 @@ protected: }; public: - enum Kind { Cleanup, Catch, Terminate, Filter, PadEnd }; + enum Kind { Cleanup, Catch, Terminate, Filter }; EHScope(Kind kind, EHScopeStack::stable_iterator enclosingEHScope) : CachedLandingPad(nullptr), CachedEHDispatchBlock(nullptr), @@ -284,8 +284,8 @@ public: return sizeof(EHCleanupScope) + CleanupBits.CleanupSize; } - EHCleanupScope(bool isNormal, bool isEH, bool isActive, - unsigned cleanupSize, unsigned fixupDepth, + EHCleanupScope(bool isNormal, bool isEH, unsigned cleanupSize, + unsigned fixupDepth, EHScopeStack::stable_iterator enclosingNormal, EHScopeStack::stable_iterator enclosingEH) : EHScope(EHScope::Cleanup, enclosingEH), @@ -293,7 +293,7 @@ public: ActiveFlag(nullptr), ExtInfo(nullptr), FixupDepth(fixupDepth) { CleanupBits.IsNormalCleanup = isNormal; CleanupBits.IsEHCleanup = isEH; - CleanupBits.IsActive = isActive; + CleanupBits.IsActive = true; CleanupBits.IsLifetimeMarker = false; CleanupBits.TestFlagInNormalCleanup = false; CleanupBits.TestFlagInEHCleanup = false; @@ -487,17 +487,6 @@ public: } }; -class EHPadEndScope : public EHScope { -public: - EHPadEndScope(EHScopeStack::stable_iterator enclosingEHScope) - : EHScope(PadEnd, enclosingEHScope) {} - static size_t getSize() { return sizeof(EHPadEndScope); } - - static bool classof(const EHScope *scope) { - return scope->getKind() == PadEnd; - } -}; - /// A non-stable pointer into the scope stack. class EHScopeStack::iterator { char *Ptr; @@ -535,10 +524,6 @@ public: case EHScope::Terminate: Size = EHTerminateScope::getSize(); break; - - case EHScope::PadEnd: - Size = EHPadEndScope::getSize(); - break; } Ptr += llvm::alignTo(Size, ScopeStackAlignment); return *this; |