diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2009-06-02 07:45:37 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2009-06-02 07:45:37 +0000 |
commit | 354e53da656237e25518b3fafa3bf84de6e6f57e (patch) | |
tree | 5312201c01229e7a4ef8d5936e0d73ced39e2f9d | |
parent | b52fe9ce99970955a5f581f5c66fcd89be9a268b (diff) |
Fix a silly typo in my previous objc_gc merging patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72723 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/AST/ASTContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 6a7113c685..29bca29f23 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -3053,7 +3053,7 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) { Result = getObjCGCQualType(Result, GCAttr); else if (Result.getObjCGCAttr() != GCAttr) Result = QualType(); - getObjCGCQualType(Result, GCAttr); + return Result; } } |