From 1033b7c1e32962948b01a25145829f17bc70a8de Mon Sep 17 00:00:00 2001 From: rdivacky Date: Tue, 16 Mar 2010 16:52:15 +0000 Subject: Update clang to r98631. --- lib/CodeGen/CGVtable.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'lib/CodeGen/CGVtable.h') diff --git a/lib/CodeGen/CGVtable.h b/lib/CodeGen/CGVtable.h index 57220d9..5a146ab 100644 --- a/lib/CodeGen/CGVtable.h +++ b/lib/CodeGen/CGVtable.h @@ -149,10 +149,12 @@ private: typedef std::pair ClassPairTy; - /// VirtualBaseClassIndicies - Contains the index into the vtable where the - /// offsets for virtual bases of a class are stored. - typedef llvm::DenseMap VirtualBaseClassIndiciesTy; - VirtualBaseClassIndiciesTy VirtualBaseClassIndicies; + /// VirtualBaseClassOffsetOffsets - Contains the vtable offset (relative to + /// the address point) in bytes where the offsets for virtual bases of a class + /// are stored. + typedef llvm::DenseMap + VirtualBaseClassOffsetOffsetsMapTy; + VirtualBaseClassOffsetOffsetsMapTy VirtualBaseClassOffsetOffsets; /// Vtables - All the vtables which have been defined. llvm::DenseMap Vtables; @@ -202,13 +204,13 @@ public: /// stored. uint64_t getMethodVtableIndex(GlobalDecl GD); - /// getVirtualBaseOffsetIndex - Return the index (relative to the vtable - /// address point) where the offset of the virtual base that contains the - /// given Base is stored, otherwise, if no virtual base contains the given + /// getVirtualBaseOffsetOffset - Return the offset in bytes (relative to the + /// vtable address point) where the offset of the virtual base that contains + /// the given base is stored, otherwise, if no virtual base contains the given /// class, return 0. Base must be a virtual base class or an unambigious /// base. - int64_t getVirtualBaseOffsetIndex(const CXXRecordDecl *RD, - const CXXRecordDecl *VBase); + int64_t getVirtualBaseOffsetOffset(const CXXRecordDecl *RD, + const CXXRecordDecl *VBase); AdjustmentVectorTy *getAdjustments(GlobalDecl GD); -- cgit v1.1