From: Eli Friedman <eli.friedman@gmail.com>
Date: Tue, 2 Jun 2009 07:45:37 +0000 (+0000)
Subject: Fix a silly typo in my previous objc_gc merging patch.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=354e53da656237e25518b3fafa3bf84de6e6f57e;p=clang

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
---

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;
     }
   }