1c1
< //===--- CGVTables.h - Emit LLVM Code for C++ vtables ---------------------===//
---
> //===--- CGVTables.h - Emit LLVM Code for C++ vtables -----------*- C++ -*-===//
19a20
> #include "clang/AST/CharUnits.h"
36c37
< uint64_t BaseOffset;
---
> CharUnits BaseOffset;
39c40
< BaseSubobject(const CXXRecordDecl *Base, uint64_t BaseOffset)
---
> BaseSubobject(const CXXRecordDecl *Base, CharUnits BaseOffset)
46c47
< uint64_t getBaseOffset() const { return BaseOffset; }
---
> CharUnits getBaseOffset() const { return BaseOffset; }
62c63
< DenseMapInfo<uint64_t>::getEmptyKey());
---
> clang::CharUnits::fromQuantity(DenseMapInfo<int64_t>::getEmptyKey()));
68c69
< DenseMapInfo<uint64_t>::getTombstoneKey());
---
> clang::CharUnits::fromQuantity(DenseMapInfo<int64_t>::getTombstoneKey()));
74c75
< DenseMapInfo<uint64_t>::getHashValue(Base.getBaseOffset());
---
> DenseMapInfo<int64_t>::getHashValue(Base.getBaseOffset().getQuantity());
105c106
< /// the address point) in bytes where the offsets for virtual bases of a class
---
> /// the address point) in chars where the offsets for virtual bases of a class
107c108
< typedef llvm::DenseMap<ClassPairTy, int64_t>
---
> typedef llvm::DenseMap<ClassPairTy, CharUnits>
237c238
< /// getVirtualBaseOffsetOffset - Return the offset in bytes (relative to the
---
> /// getVirtualBaseOffsetOffset - Return the offset in chars (relative to the
242,243c243,244
< int64_t getVirtualBaseOffsetOffset(const CXXRecordDecl *RD,
< const CXXRecordDecl *VBase);
---
> CharUnits getVirtualBaseOffsetOffset(const CXXRecordDecl *RD,
> const CXXRecordDecl *VBase);
261a263
> llvm::GlobalVariable::LinkageTypes Linkage,