diff options
| author | Warren Hunt <whunt@google.com> | 2014-07-25 20:52:51 +0000 |
|---|---|---|
| committer | Warren Hunt <whunt@google.com> | 2014-07-25 20:52:51 +0000 |
| commit | c7e6bb71b98d325e47c575e57e7b67c9c3bd7e55 (patch) | |
| tree | e79273f24e5472b0c15182208cb8066bc0e0bcce /lib/Sema/Scope.cpp | |
| parent | 11b178d35aa745817061baeb28f022bfeb3221cb (diff) | |
Revert r213437
We no longer plan to use __except_hander3 and rather use custom
personality functions per __try block.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213971 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/Scope.cpp')
| -rw-r--r-- | lib/Sema/Scope.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/Sema/Scope.cpp b/lib/Sema/Scope.cpp index 35e2075b38..6c79778823 100644 --- a/lib/Sema/Scope.cpp +++ b/lib/Sema/Scope.cpp @@ -39,9 +39,6 @@ void Scope::Init(Scope *parent, unsigned flags) { BlockParent = parent->BlockParent; TemplateParamParent = parent->TemplateParamParent; MSLocalManglingParent = parent->MSLocalManglingParent; - SEHTryParent = parent->SEHTryParent; - if (parent->Flags & SEHTryScope) - SEHTryParent = parent; if ((Flags & (FnScope | ClassScope | BlockScope | TemplateParamScope | FunctionPrototypeScope | AtCatchScope | ObjCMethodScope)) == 0) @@ -50,17 +47,13 @@ void Scope::Init(Scope *parent, unsigned flags) { Depth = 0; PrototypeDepth = 0; PrototypeIndex = 0; - SEHTryParent = MSLocalManglingParent = FnParent = BlockParent = nullptr; + MSLocalManglingParent = FnParent = BlockParent = nullptr; TemplateParamParent = nullptr; MSLocalManglingNumber = 1; } // If this scope is a function or contains breaks/continues, remember it. if (flags & FnScope) FnParent = this; - SEHTryIndexPool = 0; - SEHTryIndex = -1; - if (flags & SEHTryScope) - SEHTryIndex = FnParent ? FnParent->SEHTryIndexPool++ : -1; // The MS mangler uses the number of scopes that can hold declarations as // part of an external name. if (Flags & (ClassScope | FnScope)) { |