commit 692f85c1d217c8c3cdc06d884ad61b101c75c856
author Douglas Gregor <dgregor@apple.com> Fri Feb 26 01:17:27 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Feb 26 01:17:27 2010 +0000
tree aa0b78d1c78a2e9d75ade525db1fd59ed6455e7f
parent 42ba04a072c69d84a6660e4498215086662910ac

Commit Eli's fix for implicit conversions to array type. Fixes PR6264.


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

lib/Sema/SemaInit.cpp

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 7b4a417..762f6db 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -2227,7 +2227,7 @@
                                            ToType, CandidateSet);
         else
           S.AddConversionCandidate(Conv, I.getAccess(), ActingDC,
-                                   Initializer, cv1T1, CandidateSet);
+                                   Initializer, ToType, CandidateSet);
       }
     }
   }