[cfe-commits] r117146 - in /cfe/trunk: lib/CodeGen/CGExprAgg.cpp lib/CodeGen/CGExprCXX.cpp lib/CodeGen/CGValue.h test/CodeGenCXX/stmtexpr-copy-init.cpp
Fariborz Jahanian
fjahanian at apple.com
Fri Oct 22 14:01:02 PDT 2010
Author: fjahanian
Date: Fri Oct 22 16:01:02 2010
New Revision: 117146
URL: http://llvm.org/viewvc/llvm-project?rev=117146&view=rev
Log:
Patch fixes miscompile with non-trivial copy constructors and
statement expressions, //rdar: //8540501
Added:
cfe/trunk/test/CodeGenCXX/stmtexpr-copy-init.cpp
Modified:
cfe/trunk/lib/CodeGen/CGExprAgg.cpp
cfe/trunk/lib/CodeGen/CGExprCXX.cpp
cfe/trunk/lib/CodeGen/CGValue.h
Modified: cfe/trunk/lib/CodeGen/CGExprAgg.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprAgg.cpp?rev=117146&r1=117145&r2=117146&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprAgg.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprAgg.cpp Fri Oct 22 16:01:02 2010
@@ -147,6 +147,23 @@
/// represents a value lvalue, this method emits the address of the lvalue,
/// then loads the result into DestPtr.
void AggExprEmitter::EmitAggLoadOfLValue(const Expr *E) {
+ if (CGF.getContext().getLangOptions().CPlusPlus) {
+ if (const CXXConstructExpr *CE = Dest.getCtorExpr()) {
+ // Perform copy initialization of Src into Dest.
+ const CXXConstructorDecl *CD = CE->getConstructor();
+ CXXCtorType Type =
+ (CE->getConstructionKind() == CXXConstructExpr::CK_Complete)
+ ? Ctor_Complete : Ctor_Base;
+ bool ForVirtualBase =
+ CE->getConstructionKind() == CXXConstructExpr::CK_VirtualBase;
+ // Call the constructor.
+ const Stmt * S = dyn_cast<Stmt>(E);
+ clang::ConstExprIterator BegExp(&S);
+ CGF.EmitCXXConstructorCall(CD, Type, ForVirtualBase, Dest.getAddr(),
+ BegExp, (BegExp+1));
+ return;
+ }
+ }
LValue LV = CGF.EmitLValue(E);
EmitFinalDestCopy(E, LV);
}
@@ -204,7 +221,6 @@
CGF.CGM.getLangOptions().CPlusPlus ||
(IgnoreResult && Ignore))
return;
-
// If the source is volatile, we must read from it; to do that, we need
// some place to put it.
Dest = CGF.CreateAggTemp(E->getType(), "agg.tmp");
@@ -222,6 +238,7 @@
SizeVal);
return;
}
+
// If the result of the assignment is used, copy the LHS there also.
// FIXME: Pass VolatileDest as well. I think we also need to merge volatile
// from the source as well, as we can't eliminate it if either operand
Modified: cfe/trunk/lib/CodeGen/CGExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprCXX.cpp?rev=117146&r1=117145&r2=117146&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprCXX.cpp Fri Oct 22 16:01:02 2010
@@ -299,6 +299,7 @@
assert(getContext().hasSameUnqualifiedType(E->getType(),
E->getArg(0)->getType()));
if (E->getArg(0)->isTemporaryObject(getContext(), CD->getParent())) {
+ Dest.setCtorExpr(const_cast<CXXConstructExpr*>(E));
EmitAggExpr(E->getArg(0), Dest);
return;
}
Modified: cfe/trunk/lib/CodeGen/CGValue.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGValue.h?rev=117146&r1=117145&r2=117146&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGValue.h (original)
+++ cfe/trunk/lib/CodeGen/CGValue.h Fri Oct 22 16:01:02 2010
@@ -26,6 +26,7 @@
namespace clang {
class ObjCPropertyRefExpr;
class ObjCImplicitSetterGetterRefExpr;
+ class CXXConstructExpr;
namespace CodeGen {
class CGBitFieldInfo;
@@ -335,6 +336,7 @@
class AggValueSlot {
/// The address.
llvm::Value *Addr;
+ CXXConstructExpr *CtorExpr;
// Associated flags.
bool VolatileFlag : 1;
@@ -347,6 +349,7 @@
static AggValueSlot ignored() {
AggValueSlot AV;
AV.Addr = 0;
+ AV.CtorExpr = 0;
AV.VolatileFlag = AV.LifetimeFlag = AV.RequiresGCollection = 0;
return AV;
}
@@ -364,6 +367,7 @@
bool RequiresGCollection=false) {
AggValueSlot AV;
AV.Addr = Addr;
+ AV.CtorExpr = 0;
AV.VolatileFlag = Volatile;
AV.LifetimeFlag = LifetimeExternallyManaged;
AV.RequiresGCollection = RequiresGCollection;
@@ -375,7 +379,10 @@
return forAddr(LV.getAddress(), LV.isVolatileQualified(),
LifetimeExternallyManaged, RequiresGCollection);
}
-
+
+ void setCtorExpr(CXXConstructExpr *E) { CtorExpr = E; }
+ CXXConstructExpr *getCtorExpr() const { return CtorExpr; }
+
bool isLifetimeExternallyManaged() const {
return LifetimeFlag;
}
Added: cfe/trunk/test/CodeGenCXX/stmtexpr-copy-init.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/stmtexpr-copy-init.cpp?rev=117146&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/stmtexpr-copy-init.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/stmtexpr-copy-init.cpp Fri Oct 22 16:01:02 2010
@@ -0,0 +1,26 @@
+// RUN: %clang_cc1 -emit-llvm -o - %s
+// rdar //8540501
+
+struct A
+{
+ int i;
+ A (int j) : i(j) {}
+ A (const A &j) : i(j.i) {}
+ A& operator= (const A &j) { i = j.i; return *this; }
+};
+
+A foo(int j)
+{
+ return ({ j ? A(1) : A(0); });
+}
+
+int main()
+{
+ return foo(1).i-1;
+}
+
+void foo2()
+{
+ A b = ({ A a(1); a; });
+}
+
More information about the cfe-commits
mailing list