[cfe-commits] r106070 - /cfe/trunk/lib/Sema/SemaDeclCXX.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Jun 15 19:16:38 2010
New Revision: 106070

URL: http://llvm.org/viewvc/llvm-project?rev=106070&view=rev
Log:
Workaround a possible VS C++ bug.


Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=106070&r1=106069&r2=106070&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Tue Jun 15 19:16:38 2010
@@ -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;