diff options
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/initializer-list-ctor-order.cpp | 29 |
2 files changed, 34 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 05d05673952..3152b6b0758 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -1950,7 +1950,11 @@ void CodeGenFunction::EmitCXXConstructorCall(const CXXConstructorDecl *D, // Add the rest of the user-supplied arguments. const FunctionProtoType *FPT = D->getType()->castAs<FunctionProtoType>(); - EmitCallArgs(Args, FPT, E->arguments(), E->getConstructor()); + EvaluationOrder Order = E->isListInitialization() + ? EvaluationOrder::ForceLeftToRight + : EvaluationOrder::Default; + EmitCallArgs(Args, FPT, E->arguments(), E->getConstructor(), + /*ParamsToSkip*/ 0, Order); EmitCXXConstructorCall(D, Type, ForVirtualBase, Delegating, This, Args); } diff --git a/clang/test/CodeGenCXX/initializer-list-ctor-order.cpp b/clang/test/CodeGenCXX/initializer-list-ctor-order.cpp new file mode 100644 index 00000000000..6cd5c35d0c9 --- /dev/null +++ b/clang/test/CodeGenCXX/initializer-list-ctor-order.cpp @@ -0,0 +1,29 @@ +// RUN: %clang_cc1 -std=c++11 %s -emit-llvm -o - -triple %itanium_abi_triple | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-ITANIUM +// RUN: %clang_cc1 -std=c++11 %s -emit-llvm -o - -triple i686-windows | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-MS + +extern "C" { +int f(); +int g(); +} + +struct A { + A(int, int); +}; + + +void foo() { + A a{f(), g()}; +} +// CHECK-ITANIUM-LABEL: define void @_Z3foov +// CHECK-MS-LABEL: define void @"\01?foo@@YAXXZ" +// CHECK: call i32 @f() +// CHECK: call i32 @g() + +struct B : A { + B(); +}; +B::B() : A{f(), g()} {} +// CHECK-ITANIUM-LABEL: define void @_ZN1BC2Ev +// CHECK-MS-LABEL: define x86_thiscallcc %struct.B* @"\01??0B@@QAE@XZ" +// CHECK: call i32 @f() +// CHECK: call i32 @g() |
