diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-06-01 01:22:52 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-06-01 01:22:52 +0000 |
| commit | 852d63b806c5cbd730c6b9d696e2e27d02546b49 (patch) | |
| tree | 1d15221129c74f208498c64bf5d87482c03d9bd4 /lib | |
| parent | 44dfc98b68a482ab92e691a9215167c82515f359 (diff) | |
Disable type merging with gc attributes. This has a number of nasty
properties at the moment:
1. It allows stuff like "__strong id x; __weak id x;".
2. For constructs like "__strong id x; id x;", subsequent references to
x lose the objc_gc attribute.
3. This incorrectly allows merges involving the address_space attribute.
4. Constructs like "id x; /* some code using x */ __weak id x;" don't
apply the objc_gc attribute consistently to all uses of x.
The first three can probably be fixed relatively easily; the fourth
would be extremely difficult to fix.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72683 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index c719b0bc7d..a4b9acc110 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -3020,8 +3020,8 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { if (LHSCan.getCVRQualifiers() != RHSCan.getCVRQualifiers()) return QualType(); - Type::TypeClass LHSClass = LHSCan.getUnqualifiedType()->getTypeClass(); - Type::TypeClass RHSClass = RHSCan.getUnqualifiedType()->getTypeClass(); + Type::TypeClass LHSClass = LHSCan->getTypeClass(); + Type::TypeClass RHSClass = RHSCan->getTypeClass(); // We want to consider the two function types to be the same for these // comparisons, just force one to the other. |