From 3fcf158f18a32c237620ad4bf5899299a85851da Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 13 Dec 2013 00:09:59 +0000 Subject: [PATCH] Remove getVTT* in favor of getStructorImplicitParameter* No functionality change. The only remaining uses were in ItaniumCXXABI, which knows the implicit parameter is a VTT. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197189 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGCXXABI.h | 9 --------- lib/CodeGen/ItaniumCXXABI.cpp | 9 ++++----- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/lib/CodeGen/CGCXXABI.h b/lib/CodeGen/CGCXXABI.h index 9e9a2a7aaf..0e7577e4dc 100644 --- a/lib/CodeGen/CGCXXABI.h +++ b/lib/CodeGen/CGCXXABI.h @@ -60,15 +60,6 @@ protected: /// Get a null value for unsupported member pointers. llvm::Constant *GetBogusMemberPointer(QualType T); - // FIXME: Every place that calls getVTT{Decl,Value} is something - // that needs to be abstracted properly. - ImplicitParamDecl *&getVTTDecl(CodeGenFunction &CGF) { - return CGF.CXXStructorImplicitParamDecl; - } - llvm::Value *&getVTTValue(CodeGenFunction &CGF) { - return CGF.CXXStructorImplicitParamValue; - } - ImplicitParamDecl *&getStructorImplicitParamDecl(CodeGenFunction &CGF) { return CGF.CXXStructorImplicitParamDecl; } diff --git a/lib/CodeGen/ItaniumCXXABI.cpp b/lib/CodeGen/ItaniumCXXABI.cpp index 200a8fd2d3..2a311a0cf0 100644 --- a/lib/CodeGen/ItaniumCXXABI.cpp +++ b/lib/CodeGen/ItaniumCXXABI.cpp @@ -878,7 +878,7 @@ void ItaniumCXXABI::BuildInstanceFunctionParams(CodeGenFunction &CGF, = ImplicitParamDecl::Create(Context, 0, MD->getLocation(), &Context.Idents.get("vtt"), T); Params.push_back(VTTDecl); - getVTTDecl(CGF) = VTTDecl; + getStructorImplicitParamDecl(CGF) = VTTDecl; } } @@ -887,10 +887,9 @@ void ItaniumCXXABI::EmitInstanceFunctionProlog(CodeGenFunction &CGF) { EmitThisParam(CGF); /// Initialize the 'vtt' slot if needed. - if (getVTTDecl(CGF)) { - getVTTValue(CGF) - = CGF.Builder.CreateLoad(CGF.GetAddrOfLocalVar(getVTTDecl(CGF)), - "vtt"); + if (getStructorImplicitParamDecl(CGF)) { + getStructorImplicitParamValue(CGF) = CGF.Builder.CreateLoad( + CGF.GetAddrOfLocalVar(getStructorImplicitParamDecl(CGF)), "vtt"); } /// If this is a function that the ABI specifies returns 'this', initialize -- 2.40.0