diff --git a/llvm/test/tools/obj2yaml/ELF/offset.yaml b/llvm/test/tools/obj2yaml/ELF/offset.yaml
--- a/llvm/test/tools/obj2yaml/ELF/offset.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/offset.yaml
@@ -32,6 +32,10 @@
 # BASIC-NEXT:     Type:         SHT_PROGBITS
 # BASIC-NEXT:     AddressAlign: 0x10
 # BASIC-NEXT:     Offset:       0x200
+# BASIC-NEXT:   - Name:         .bar4
+# BASIC-NEXT:     Type:         SHT_PROGBITS
+# BASIC-NEXT:     AddressAlign: 0x100000000
+# BASIC-NEXT:     Offset:       0x210
 
 --- !ELF
 FileHeader:
@@ -81,6 +85,12 @@
     Type:         SHT_PROGBITS
     AddressAlign: 0x10
     Offset:       0x200
+## A case where AddressAlign > MAX_UINT32 and (uint32_t)AddressAlign == 0.
+## Check we dump an offset in this case properly.
+  - Name:         .bar4
+    Type:         SHT_PROGBITS
+    AddressAlign: 0x100000000
+    Offset:       0x210
 
 ## Show we dump the "Offset" key for the first section when
 ## it has an unexpected file offset.
diff --git a/llvm/tools/obj2yaml/elf2yaml.cpp b/llvm/tools/obj2yaml/elf2yaml.cpp
--- a/llvm/tools/obj2yaml/elf2yaml.cpp
+++ b/llvm/tools/obj2yaml/elf2yaml.cpp
@@ -248,8 +248,8 @@
     ELFYAML::Section &Sec = *cast<ELFYAML::Section>(C.get());
     const typename ELFT::Shdr &SecHdr = S[Sec.OriginalSecNdx];
 
-    ExpectedOffset =
-        alignTo(ExpectedOffset, SecHdr.sh_addralign ? SecHdr.sh_addralign : 1);
+    ExpectedOffset = alignTo(ExpectedOffset,
+                             SecHdr.sh_addralign ? SecHdr.sh_addralign : 1uLL);
 
     // We only set the "Offset" field when it can't be naturally derived
     // from the offset and size of the previous section. This reduces