maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

When instantiating a new-expression, force a rebuild if there were default 

arguments in either the placement or constructor arguments.  This is
important if the default arguments refer to a declaration or create a
temporary.

llvm-svn: 115700
This commit is contained in:
John McCall 2010-10-05 22:36:42 +00:00
parent 0ad137e98e
commit 09d1369964
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Sema/TreeTransform.h
View File

@ -5278,6 +5278,11 @@ TreeTransform<Derived>::TransformCXXNewExpr(CXXNewExpr *E) {
bool ArgumentChanged = false; bool ArgumentChanged = false;
ASTOwningVector<Expr*> PlacementArgs(SemaRef); ASTOwningVector<Expr*> PlacementArgs(SemaRef);
for (unsigned I = 0, N = E->getNumPlacementArgs(); I != N; ++I) { for (unsigned I = 0, N = E->getNumPlacementArgs(); I != N; ++I) {
if (getDerived().DropCallArgument(E->getPlacementArg(I))) {
ArgumentChanged = true;
break;
}
ExprResult Arg = getDerived().TransformExpr(E->getPlacementArg(I)); ExprResult Arg = getDerived().TransformExpr(E->getPlacementArg(I));
if (Arg.isInvalid()) if (Arg.isInvalid())
return ExprError(); return ExprError();
@ -5289,8 +5294,10 @@ TreeTransform<Derived>::TransformCXXNewExpr(CXXNewExpr *E) {
// transform the constructor arguments (if any). // transform the constructor arguments (if any).
ASTOwningVector<Expr*> ConstructorArgs(SemaRef); ASTOwningVector<Expr*> ConstructorArgs(SemaRef);
for (unsigned I = 0, N = E->getNumConstructorArgs(); I != N; ++I) { for (unsigned I = 0, N = E->getNumConstructorArgs(); I != N; ++I) {
if (getDerived().DropCallArgument(E->getConstructorArg(I))) if (getDerived().DropCallArgument(E->getConstructorArg(I))) {
ArgumentChanged = true;
break; break;
}
ExprResult Arg = getDerived().TransformExpr(E->getConstructorArg(I)); ExprResult Arg = getDerived().TransformExpr(E->getConstructorArg(I));
if (Arg.isInvalid()) if (Arg.isInvalid())

54
clang/test/CodeGenCXX/goto.cpp
View File

@ -1,29 +1,43 @@
// RUN: %clang-cc1 %s -fexceptions -emit-llvm-only // RUN: %clang-cc1 %s -triple=x86_64-apple-darwin10 -fexceptions -emit-llvm -o - | FileCheck %s
// Reduced from a crash on boost::interprocess's node_allocator_test.cpp. // Reduced from a crash on boost::interprocess's node_allocator_test.cpp.
namespace test0 { namespace test0 {
struct A { A(); ~A(); }; struct A { A(); ~A(); };
struct V { V(const A &a = A()); ~V(); }; struct V { V(const A &a = A()); ~V(); };
template<int X> int vector_test() // CHECK: define linkonce_odr i32 @_ZN5test04testILi0EEEii
{ template<int X> int test(int x) {
A process_name; // CHECK: [[RET:%.*]] = alloca i32
try { // CHECK-NEXT: [[X:%.*]] = alloca i32
A segment; // CHECK-NEXT: [[Y:%.*]] = alloca [[A:%.*]],
// CHECK-NEXT: [[Z:%.*]] = alloca [[A]]
// CHECK-NEXT: [[EXN:%.*]] = alloca i8*
// CHECK-NEXT: alloca i32
// CHECK-NEXT: [[V:%.*]] = alloca [[V:%.*]]*,
// CHECK-NEXT: [[TMP:%.*]] = alloca [[A]]
// CHECK-NEXT: [[CLEANUPACTIVE:%.*]] = alloca i1
// CHECK: store i1 true, i1* [[CLEANUPACTIVE]]
// CHECK: call void @_ZN5test01AC1Ev([[A]]* [[Y]])
// CHECK-NEXT: invoke void @_ZN5test01AC1Ev([[A]]* [[Z]])
// CHECK: [[NEW:%.*]] = invoke noalias i8* @_Znwm(i64 1)
// CHECK: [[NEWCAST:%.*]] = bitcast i8* [[NEW]] to [[V]]*
// CHECK-NEXT: invoke void @_ZN5test01AC1Ev([[A]]* [[TMP]])
// CHECK: invoke void @_ZN5test01VC1ERKNS_1AE([[V]]* [[NEWCAST]], [[A]]* [[TMP]])
// CHECK: store i1 false, i1* [[CLEANUPACTIVE]]
// CHECK-NEXT: invoke void @_ZN5test01AD1Ev([[A]]* [[TMP]])
A y;
try {
A z;
V *v = new V();
V *stdvector = new V(); if (x) return 1;
} catch (int ex) {
return 1;
}
return 0;
}
int x = 5, y = 7; int test() {
if(x == y) return 1; return test<0>(5);
} }
catch(int ex){
return 1;
}
return 0;
}
int main ()
{
return vector_test<0>();
}
} }