aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AST/ASTContext.cpp2
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;
}
}