diff options
author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-28 23:39:14 +0000 |
---|---|---|
committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-28 23:39:14 +0000 |
commit | 32a9a7543f0296b0ae141899005f788bbe4262ca (patch) | |
tree | 9138950a9aa6223fd1c220ca8fb8feb4e9458f7a /lib/Sema/Scope.cpp | |
parent | 2422e82b54aa115bba23da3a44998477720ef6a4 (diff) |
Revert r151638 because it causes assertion hit on PCH creation for Cocoa.h
Original log:
---------------------
Correctly track tags and enum members defined in the prototype of a function, and ensure they are properly scoped.
This fixes code such as:
enum e {x, y};
int f(enum {y, x} n) {
return 0;
}
This finally fixes PR5464 and PR5477.
---------------------
I also reverted r151641 which was enhancement on top of r151638.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151667 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/Scope.cpp')
-rw-r--r-- | lib/Sema/Scope.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/Sema/Scope.cpp b/lib/Sema/Scope.cpp index 10f12ce844..c76f61af6c 100644 --- a/lib/Sema/Scope.cpp +++ b/lib/Sema/Scope.cpp @@ -59,13 +59,3 @@ void Scope::Init(Scope *parent, unsigned flags) { Entity = 0; ErrorTrap.reset(); } - -bool Scope::containedInPrototypeScope() const { - const Scope *S = this; - while (S) { - if (S->isFunctionPrototypeScope()) - return true; - S = S->getParent(); - } - return false; -} |