Do codegen correctly for va_start/end/copy on architectures where

va_list is a struct, like x86-64.

If anyone has a better idea for how to do the check in the if 
statements, suggestions are welcome.

llvm-svn: 62582

1 files changed, 14 insertions, 4 deletions

diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 2d840ffd8d6..043f2843981 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -53,7 +53,12 @@ RValue CodeGenFunction::EmitBuiltinExpr(unsigned BuiltinID, const CallExpr *E) {
   case Builtin::BI__builtin_stdarg_start:
   case Builtin::BI__builtin_va_start:
   case Builtin::BI__builtin_va_end: {
-    Value *ArgValue = EmitLValue(E->getArg(0)).getAddress();
+    Value *ArgValue;
+    if (CGM.getContext().getBuiltinVaListType()->isArrayType()) {
+      ArgValue = EmitScalarExpr(E->getArg(0));
+    } else {
+      ArgValue = EmitLValue(E->getArg(0)).getAddress();
+    }
     const llvm::Type *DestType = 
       llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
     if (ArgValue->getType() != DestType)
@@ -65,9 +70,14 @@ RValue CodeGenFunction::EmitBuiltinExpr(unsigned BuiltinID, const CallExpr *E) {
     return RValue::get(Builder.CreateCall(CGM.getIntrinsic(inst), ArgValue));
   }
   case Builtin::BI__builtin_va_copy: {
-    // FIXME: This does not yet handle architectures where va_list is a struct.
-    Value *DstPtr = EmitLValue(E->getArg(0)).getAddress();
-    Value *SrcPtr = EmitLValue(E->getArg(1)).getAddress();
+    Value *DstPtr, *SrcPtr;
+    if (CGM.getContext().getBuiltinVaListType()->isArrayType()) {
+      DstPtr = EmitScalarExpr(E->getArg(0));
+      SrcPtr = EmitScalarExpr(E->getArg(1));
+    } else {
+      DstPtr = EmitLValue(E->getArg(0)).getAddress();
+      SrcPtr = EmitLValue(E->getArg(1)).getAddress();
+    }
 
     const llvm::Type *Type = 
       llvm::PointerType::getUnqual(llvm::Type::Int8Ty);