]> granicus.if.org Git - clang/commitdiff
Fix a silly typo in my previous objc_gc merging patch.
authorEli Friedman <eli.friedman@gmail.com>
Tue, 2 Jun 2009 07:45:37 +0000 (07:45 +0000)
committerEli Friedman <eli.friedman@gmail.com>
Tue, 2 Jun 2009 07:45:37 +0000 (07:45 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72723 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/ASTContext.cpp

index 6a7113c685cb035e4a812dbce540635fc918d361..29bca29f230cfb3b48789f18adc56a3af923383f 100644 (file)
@@ -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;
     }
   }