diff options
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 16 | ||||
-rw-r--r-- | llvm/lib/IR/DebugInfoMetadata.cpp | 12 | ||||
-rw-r--r-- | llvm/lib/IR/LLVMContextImpl.h | 28 |
3 files changed, 28 insertions, 28 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index 1ea06163c9e..28b8d22e579 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -3304,8 +3304,8 @@ bool LLParser::ParseMDBasicType(MDNode *&Result, bool IsDistinct) { #define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ REQUIRED(tag, DwarfTagField, ); \ OPTIONAL(name, MDStringField, ); \ - OPTIONAL(size, MDUnsignedField, (0, UINT32_MAX)); \ - OPTIONAL(align, MDUnsignedField, (0, UINT32_MAX)); \ + OPTIONAL(size, MDUnsignedField, (0, UINT64_MAX)); \ + OPTIONAL(align, MDUnsignedField, (0, UINT64_MAX)); \ OPTIONAL(encoding, DwarfAttEncodingField, ); PARSE_MD_FIELDS(); #undef VISIT_MD_FIELDS @@ -3327,9 +3327,9 @@ bool LLParser::ParseMDDerivedType(MDNode *&Result, bool IsDistinct) { OPTIONAL(line, LineField, ); \ OPTIONAL(scope, MDField, ); \ REQUIRED(baseType, MDField, ); \ - OPTIONAL(size, MDUnsignedField, (0, UINT32_MAX)); \ - OPTIONAL(align, MDUnsignedField, (0, UINT32_MAX)); \ - OPTIONAL(offset, MDUnsignedField, (0, UINT32_MAX)); \ + OPTIONAL(size, MDUnsignedField, (0, UINT64_MAX)); \ + OPTIONAL(align, MDUnsignedField, (0, UINT64_MAX)); \ + OPTIONAL(offset, MDUnsignedField, (0, UINT64_MAX)); \ OPTIONAL(flags, MDUnsignedField, (0, UINT32_MAX)); \ OPTIONAL(extraData, MDField, ); PARSE_MD_FIELDS(); @@ -3350,9 +3350,9 @@ bool LLParser::ParseMDCompositeType(MDNode *&Result, bool IsDistinct) { OPTIONAL(line, LineField, ); \ OPTIONAL(scope, MDField, ); \ OPTIONAL(baseType, MDField, ); \ - OPTIONAL(size, MDUnsignedField, (0, UINT32_MAX)); \ - OPTIONAL(align, MDUnsignedField, (0, UINT32_MAX)); \ - OPTIONAL(offset, MDUnsignedField, (0, UINT32_MAX)); \ + OPTIONAL(size, MDUnsignedField, (0, UINT64_MAX)); \ + OPTIONAL(align, MDUnsignedField, (0, UINT64_MAX)); \ + OPTIONAL(offset, MDUnsignedField, (0, UINT64_MAX)); \ OPTIONAL(flags, MDUnsignedField, (0, UINT32_MAX)); \ OPTIONAL(elements, MDField, ); \ OPTIONAL(runtimeLang, DwarfLangField, ); \ diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp index a2f5d55c3c6..83c816d18ae 100644 --- a/llvm/lib/IR/DebugInfoMetadata.cpp +++ b/llvm/lib/IR/DebugInfoMetadata.cpp @@ -148,8 +148,8 @@ MDEnumerator *MDEnumerator::getImpl(LLVMContext &Context, int64_t Value, } MDBasicType *MDBasicType::getImpl(LLVMContext &Context, unsigned Tag, - MDString *Name, unsigned SizeInBits, - unsigned AlignInBits, unsigned Encoding, + MDString *Name, uint64_t SizeInBits, + uint64_t AlignInBits, unsigned Encoding, StorageType Storage, bool ShouldCreate) { assert(isCanonical(Name) && "Expected canonical MDString"); DEFINE_GETIMPL_LOOKUP( @@ -161,8 +161,8 @@ MDBasicType *MDBasicType::getImpl(LLVMContext &Context, unsigned Tag, MDDerivedType *MDDerivedType::getImpl( LLVMContext &Context, unsigned Tag, MDString *Name, Metadata *File, - unsigned Line, Metadata *Scope, Metadata *BaseType, unsigned SizeInBits, - unsigned AlignInBits, unsigned OffsetInBits, unsigned Flags, + unsigned Line, Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, + uint64_t AlignInBits, uint64_t OffsetInBits, unsigned Flags, Metadata *ExtraData, StorageType Storage, bool ShouldCreate) { assert(isCanonical(Name) && "Expected canonical MDString"); DEFINE_GETIMPL_LOOKUP(MDDerivedType, (Tag, getString(Name), File, Line, Scope, @@ -176,8 +176,8 @@ MDDerivedType *MDDerivedType::getImpl( MDCompositeType *MDCompositeType::getImpl( LLVMContext &Context, unsigned Tag, MDString *Name, Metadata *File, - unsigned Line, Metadata *Scope, Metadata *BaseType, unsigned SizeInBits, - unsigned AlignInBits, unsigned OffsetInBits, unsigned Flags, + unsigned Line, Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, + uint64_t AlignInBits, uint64_t OffsetInBits, unsigned Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, Metadata *TemplateParams, MDString *Identifier, StorageType Storage, bool ShouldCreate) { diff --git a/llvm/lib/IR/LLVMContextImpl.h b/llvm/lib/IR/LLVMContextImpl.h index 3c61c06b81a..4631246d77a 100644 --- a/llvm/lib/IR/LLVMContextImpl.h +++ b/llvm/lib/IR/LLVMContextImpl.h @@ -303,12 +303,12 @@ template <> struct MDNodeKeyImpl<MDEnumerator> { template <> struct MDNodeKeyImpl<MDBasicType> { unsigned Tag; StringRef Name; - unsigned SizeInBits; - unsigned AlignInBits; + uint64_t SizeInBits; + uint64_t AlignInBits; unsigned Encoding; - MDNodeKeyImpl(unsigned Tag, StringRef Name, unsigned SizeInBits, - unsigned AlignInBits, unsigned Encoding) + MDNodeKeyImpl(unsigned Tag, StringRef Name, uint64_t SizeInBits, + uint64_t AlignInBits, unsigned Encoding) : Tag(Tag), Name(Name), SizeInBits(SizeInBits), AlignInBits(AlignInBits), Encoding(Encoding) {} MDNodeKeyImpl(const MDBasicType *N) @@ -333,15 +333,15 @@ template <> struct MDNodeKeyImpl<MDDerivedType> { unsigned Line; Metadata *Scope; Metadata *BaseType; - unsigned SizeInBits; - unsigned AlignInBits; - unsigned OffsetInBits; + uint64_t SizeInBits; + uint64_t AlignInBits; + uint64_t OffsetInBits; unsigned Flags; Metadata *ExtraData; MDNodeKeyImpl(unsigned Tag, StringRef Name, Metadata *File, unsigned Line, - Metadata *Scope, Metadata *BaseType, unsigned SizeInBits, - unsigned AlignInBits, unsigned OffsetInBits, unsigned Flags, + Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, + uint64_t AlignInBits, uint64_t OffsetInBits, unsigned Flags, Metadata *ExtraData) : Tag(Tag), Name(Name), File(File), Line(Line), Scope(Scope), BaseType(BaseType), SizeInBits(SizeInBits), AlignInBits(AlignInBits), @@ -375,9 +375,9 @@ template <> struct MDNodeKeyImpl<MDCompositeType> { unsigned Line; Metadata *Scope; Metadata *BaseType; - unsigned SizeInBits; - unsigned AlignInBits; - unsigned OffsetInBits; + uint64_t SizeInBits; + uint64_t AlignInBits; + uint64_t OffsetInBits; unsigned Flags; Metadata *Elements; unsigned RuntimeLang; @@ -386,8 +386,8 @@ template <> struct MDNodeKeyImpl<MDCompositeType> { StringRef Identifier; MDNodeKeyImpl(unsigned Tag, StringRef Name, Metadata *File, unsigned Line, - Metadata *Scope, Metadata *BaseType, unsigned SizeInBits, - unsigned AlignInBits, unsigned OffsetInBits, unsigned Flags, + Metadata *Scope, Metadata *BaseType, uint64_t SizeInBits, + uint64_t AlignInBits, uint64_t OffsetInBits, unsigned Flags, Metadata *Elements, unsigned RuntimeLang, Metadata *VTableHolder, Metadata *TemplateParams, StringRef Identifier) |