From: Anders Carlsson Date: Wed, 3 Feb 2010 16:38:03 +0000 (+0000) Subject: Revert the new reference binding code; I came up with a way simpler solution for... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a64a869312066ff6119d1d7ae03f88ce499e3f82;p=clang Revert the new reference binding code; I came up with a way simpler solution for the reference binding bug that is preventing self-hosting. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95223 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index e1fe0d29a2..ce361f08fe 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -802,11 +802,8 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI, } RValue CodeGenFunction::EmitCallArg(const Expr *E, QualType ArgType) { - if (const CXXBindReferenceExpr *BE = dyn_cast(E)) - return RValue::get(EmitCXXBindReferenceExpr(BE)); - if (ArgType->isReferenceType()) - return EmitReferenceBindingToExpr(E, ArgType); + return EmitReferenceBindingToExpr(E); return EmitAnyExprToTemp(E); } diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 8362945e1e..70973a4560 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -838,7 +838,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF, // was implicitly generated, we shouldn't be zeroing memory. RValue RHS; if (FieldType->isReferenceType()) { - RHS = CGF.EmitReferenceBindingToExpr(MemberInit->getInit(), FieldType, + RHS = CGF.EmitReferenceBindingToExpr(MemberInit->getInit(), /*IsInitializer=*/true); CGF.EmitStoreThroughLValue(RHS, LHS, FieldType); } else if (FieldType->isArrayType() && !MemberInit->getInit()) { diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 6ba537e528..e27c5e4e51 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -507,12 +507,8 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) { Builder.CreateCall4(CGM.getMemCpyFn(), Loc, SrcPtr, SizeVal, AlignVal); } - } else if (const CXXBindReferenceExpr *BE = - dyn_cast(Init)) { - llvm::Value *V = EmitCXXBindReferenceExpr(BE); - EmitStoreOfScalar(V, Loc, /*Volatile=*/false, Ty); } else if (Ty->isReferenceType()) { - RValue RV = EmitReferenceBindingToExpr(Init, Ty, /*IsInitializer=*/true); + RValue RV = EmitReferenceBindingToExpr(Init, /*IsInitializer=*/true); EmitStoreOfScalar(RV.getScalarVal(), Loc, false, Ty); } else if (!hasAggregateLLVMType(Init->getType())) { llvm::Value *V = EmitScalarExpr(Init); diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index 3f1a7225fb..3d5a4e8051 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -81,7 +81,7 @@ void CodeGenFunction::EmitCXXGlobalVarDeclInit(const VarDecl &D, return; } if (Init->isLvalue(getContext()) == Expr::LV_Valid) { - RValue RV = EmitReferenceBindingToExpr(Init, T, /*IsInitializer=*/true); + RValue RV = EmitReferenceBindingToExpr(Init, /*IsInitializer=*/true); EmitStoreOfScalar(RV.getScalarVal(), DeclPtr, false, T); return; } @@ -225,7 +225,7 @@ CodeGenFunction::EmitStaticCXXBlockVarDeclInit(const VarDecl &D, QualType T = D.getType(); // We don't want to pass true for IsInitializer here, because a static // reference to a temporary does not extend its lifetime. - RValue RV = EmitReferenceBindingToExpr(D.getInit(), T, + RValue RV = EmitReferenceBindingToExpr(D.getInit(), /*IsInitializer=*/false); EmitStoreOfScalar(RV.getScalarVal(), GV, /*Volatile=*/false, T); diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index ab4f8f1935..2ceefae0a0 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -92,31 +92,8 @@ RValue CodeGenFunction::EmitAnyExprToTemp(const Expr *E, IsInitializer); } -llvm::Value * -CodeGenFunction::EmitCXXBindReferenceExpr(const CXXBindReferenceExpr *E) { - QualType T = E->getType(); - assert(T->isAnyComplexType() && "FIXME: Unhandled bind expression!"); - - const Expr *SubExpr = E->getSubExpr(); - - if (!E->requiresTemporaryCopy()) - return EmitLValue(SubExpr).getAddress(); - - llvm::Value *Value = CreateTempAlloca(ConvertTypeForMem(T), "reftmp"); - - if (T->isAnyComplexType()) - EmitComplexExprIntoAddr(SubExpr, Value, /*DestIsVolatile=*/false); - else - assert(false && "Unhandled bind expression"); - - return Value; -} - RValue CodeGenFunction::EmitReferenceBindingToExpr(const Expr* E, - QualType DestType, bool IsInitializer) { - assert(!E->getType()->isAnyComplexType() && - "Should not use this function for complex types!"); bool ShouldDestroyTemporaries = false; unsigned OldNumLiveTemporaries = 0; @@ -478,8 +455,6 @@ LValue CodeGenFunction::EmitLValue(const Expr *E) { return EmitCXXConstructLValue(cast(E)); case Expr::CXXBindTemporaryExprClass: return EmitCXXBindTemporaryLValue(cast(E)); - case Expr::CXXBindReferenceExprClass: - return EmitLValue(cast(E)->getSubExpr()); case Expr::CXXExprWithTemporariesClass: return EmitCXXExprWithTemporariesLValue(cast(E)); case Expr::CXXZeroInitValueExprClass: diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index 5de91ee335..3e47469e76 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -1111,10 +1111,7 @@ public: /// EmitReferenceBindingToExpr - Emits a reference binding to the passed in /// expression. Will emit a temporary variable if E is not an LValue. - RValue EmitReferenceBindingToExpr(const Expr* E, QualType DestType, - bool IsInitializer = false); - - llvm::Value *EmitCXXBindReferenceExpr(const CXXBindReferenceExpr *E); + RValue EmitReferenceBindingToExpr(const Expr* E, bool IsInitializer = false); //===--------------------------------------------------------------------===// // Expression Emission diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 7c52df5f7c..1f1e76c999 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -3304,31 +3304,16 @@ InitializationSequence::Perform(Sema &S, // Check exception specifications if (S.CheckExceptionSpecCompatibility(CurInitExpr, DestType)) return S.ExprError(); - - // FIXME: We should do this for all types. - if (DestType->isAnyComplexType()) { - CurInit = - S.Owned(CXXBindReferenceExpr::Create(S.Context, - CurInit.takeAs(), - /*ExtendsLifetime=*/false, - /*RequiresTemporaryCopy=*/false)); - } break; case SK_BindReferenceToTemporary: + // Reference binding does not have any corresponding ASTs. + // Check exception specifications if (S.CheckExceptionSpecCompatibility(CurInitExpr, DestType)) return S.ExprError(); - // FIXME: We should do this for all types. - if (DestType->isAnyComplexType()) { - CurInit = - S.Owned(CXXBindReferenceExpr::Create(S.Context, - CurInit.takeAs(), - /*ExtendsLifetime=*/false, - /*RequiresTemporaryCopy=*/true)); - } break; case SK_UserConversion: {