commit 00bdca561aad6f418e7a13fce9163e8c985db0ad
author Fariborz Jahanian <fjahanian@apple.com> Wed Jun 16 00:16:38 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Jun 16 00:16:38 2010 +0000
tree 2fb09ca58b5f8a9eedf80436d76cd31ee01db0d3
parent 0952ea77ee161a6899706362437f753705d9fe04

Workaround a possible VS C++ bug.

llvm-svn: 106070

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 0fb30d8..595a05b 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -4688,12 +4688,18 @@
       llvm::SmallVector<SourceLocation, 4> Commas; // FIXME: Silly
       Commas.push_back(Loc);
       Commas.push_back(Loc);
-      OwningExprResult Call = ActOnCallExpr(/*Scope=*/0,
-                                  NeedsCollectableMemCpy ?
-                                    Owned(CollectableMemCpyRef->Retain()) :
-                                    Owned(BuiltinMemCpyRef->Retain()),
-                                  Loc, move_arg(CallArgs), 
-                                  Commas.data(), Loc);
+      OwningExprResult Call = ExprError();
+      if (NeedsCollectableMemCpy)
+        Call = ActOnCallExpr(/*Scope=*/0,
+                             Owned(CollectableMemCpyRef->Retain()),
+                             Loc, move_arg(CallArgs), 
+                             Commas.data(), Loc);
+      else
+        Call = ActOnCallExpr(/*Scope=*/0,
+                             Owned(BuiltinMemCpyRef->Retain()),
+                             Loc, move_arg(CallArgs), 
+                             Commas.data(), Loc);
+          
       assert(!Call.isInvalid() && "Call to __builtin_memcpy cannot fail!");
       Statements.push_back(Call.takeAs<Expr>());
       continue;