commit 756440670c6e7f338b95d38bc5ad82b70cf65b00
author Steve Naroff <snaroff@apple.com> Wed Jul 25 20:45:33 2007 +0000
committer Steve Naroff <snaroff@apple.com> Wed Jul 25 20:45:33 2007 +0000
tree 62a6b3230df26bd6a1ebcfcd421609add623dd8f
parent 4b0096578e961587d1ec0ed5dce45f592a65ed41

- Fix commit in Parser.h (patch by Kevin Andre).
- Add comment and minor cleanup to yesterday's fix to ParseCallExpr().


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@40492 91177308-0d34-0410-b5e6-96231b3b80d8

Sema/SemaExpr.cpp

diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index abc3ce3..955ac68 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -434,12 +434,10 @@
       QualType lhsType = proto->getArgType(i);
       QualType rhsType = argExpr->getType();
 
-      // C99 6.7.5.3p7
+      // If necessary, apply function/array conversion. C99 6.7.5.3p[7,8]. 
       if (const ArrayType *ary = lhsType->isArrayType())
         lhsType = Context.getPointerType(ary->getElementType());
-        
-      // C99 6.7.5.3p8
-      if (lhsType->isFunctionType())
+      else if (lhsType->isFunctionType())
         lhsType = Context.getPointerType(lhsType);
 
       AssignmentCheckResult result = CheckSingleAssignmentConstraints(lhsType,