Rename BaseLLVMType to NonVirtualBaseLLVMType.

llvm-svn: 119956
This commit is contained in:
Anders Carlsson 2010-11-21 23:59:45 +00:00
parent e64fbe2a6c
commit a7dd96ce77
2 changed files with 8 additions and 7 deletions

View File

@ -177,7 +177,7 @@ private:
/// The LLVM type for the non-virtual part of this record layout, used for /// The LLVM type for the non-virtual part of this record layout, used for
/// laying out the record as a base. /// laying out the record as a base.
const llvm::Type *BaseLLVMType; const llvm::Type *NonVirtualBaseLLVMType;
/// Map from (non-bit-field) struct field to the corresponding llvm struct /// Map from (non-bit-field) struct field to the corresponding llvm struct
/// type field no. This info is populated by record builder. /// type field no. This info is populated by record builder.
@ -196,9 +196,10 @@ private:
bool IsZeroInitializable : 1; bool IsZeroInitializable : 1;
public: public:
CGRecordLayout(const llvm::Type *LLVMType, const llvm::Type *BaseLLVMType, CGRecordLayout(const llvm::Type *LLVMType,
const llvm::Type *NonVirtualBaseLLVMType,
bool IsZeroInitializable) bool IsZeroInitializable)
: LLVMType(LLVMType), BaseLLVMType(BaseLLVMType), : LLVMType(LLVMType), NonVirtualBaseLLVMType(NonVirtualBaseLLVMType),
IsZeroInitializable(IsZeroInitializable) {} IsZeroInitializable(IsZeroInitializable) {}
/// \brief Return the LLVM type associated with this record. /// \brief Return the LLVM type associated with this record.
@ -206,8 +207,8 @@ public:
return LLVMType; return LLVMType;
} }
const llvm::Type *getBaseLLVMType() const { const llvm::Type *getNonVirtualBaseLLVMType() const {
return BaseLLVMType; return NonVirtualBaseLLVMType;
} }
/// \brief Check whether this struct can be C++ zero-initialized /// \brief Check whether this struct can be C++ zero-initialized

View File

@ -832,8 +832,8 @@ CGRecordLayout *CodeGenTypes::ComputeRecordLayout(const RecordDecl *D) {
void CGRecordLayout::print(llvm::raw_ostream &OS) const { void CGRecordLayout::print(llvm::raw_ostream &OS) const {
OS << "<CGRecordLayout\n"; OS << "<CGRecordLayout\n";
OS << " LLVMType:" << *LLVMType << "\n"; OS << " LLVMType:" << *LLVMType << "\n";
if (BaseLLVMType) if (NonVirtualBaseLLVMType)
OS << " BaseLLVMType:" << *BaseLLVMType << "\n"; OS << " NonVirtualBaseLLVMType:" << *NonVirtualBaseLLVMType << "\n";
OS << " IsZeroInitializable:" << IsZeroInitializable << "\n"; OS << " IsZeroInitializable:" << IsZeroInitializable << "\n";
OS << " BitFields:[\n"; OS << " BitFields:[\n";