Update for LLVM function name change.

llvm-svn: 257801

7 files changed, 28 insertions, 33 deletions

diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
index c0ecbfa9e44..4f28972bd81 100644
--- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h
@@ -40,7 +40,7 @@ public:
     std::call_once(_tpOffOnce, [this]() {
       for (const auto &phdr : *_programHeader) {
         if (phdr->p_type == llvm::ELF::PT_TLS) {
-          _tpOff = llvm::RoundUpToAlignment(TCB_SIZE, phdr->p_align);
+          _tpOff = llvm::alignTo(TCB_SIZE, phdr->p_align);
           break;
         }
       }
diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
index 0352e81a1f6..32caaf9b961 100644
--- a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h
@@ -122,7 +122,7 @@ public:
     std::call_once(_tpOffOnce, [this]() {
       for (const auto &phdr : *_programHeader) {
         if (phdr->p_type == llvm::ELF::PT_TLS) {
-          _tpOff = llvm::RoundUpToAlignment(TCB_SIZE, phdr->p_align);
+          _tpOff = llvm::alignTo(TCB_SIZE, phdr->p_align);
           break;
         }
       }
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.cpp
index 98cc059787e..8f494256ac2 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.cpp
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsSectionChunks.cpp
@@ -58,7 +58,7 @@ MipsOptionsSection<ELFT>::MipsOptionsSection(
   this->setOrder(MipsTargetLayout<ELFT>::ORDER_MIPS_OPTIONS);
   this->_entSize = 1;
   this->_alignment = 8;
-  this->_fsize = llvm::RoundUpToAlignment(
+  this->_fsize = llvm::alignTo(
       sizeof(Elf_Mips_Options) + sizeof(Elf_Mips_RegInfo), this->_alignment);
   this->_msize = this->_fsize;
   this->_type = SHT_MIPS_OPTIONS;
@@ -100,7 +100,7 @@ MipsAbiFlagsSection<ELFT>::MipsAbiFlagsSection(
       _targetLayout(targetLayout) {
   this->setOrder(MipsTargetLayout<ELFT>::ORDER_MIPS_ABI_FLAGS);
   this->_alignment = 8;
-  this->_fsize = llvm::RoundUpToAlignment(sizeof(_abiFlags), this->_alignment);
+  this->_fsize = llvm::alignTo(sizeof(_abiFlags), this->_alignment);
   this->_msize = this->_fsize;
   this->_entSize = this->_fsize;
   this->_type = SHT_MIPS_ABIFLAGS;
diff --git a/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp b/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp
index 99449f7d45a..36a39b2f1f9 100644
--- a/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp
+++ b/lld/lib/ReaderWriter/ELF/SegmentChunks.cpp
@@ -156,7 +156,7 @@ void Segment<ELFT>::assignFileOffsets(uint64_t startOffset) {
         fileOffset = newOffset;
       }
       // Align fileoffset to the alignment of the section.
-      fileOffset = llvm::RoundUpToAlignment(fileOffset, section->alignment());
+      fileOffset = llvm::alignTo(fileOffset, section->alignment());
       // If the linker outputmagic is set to OutputMagic::NMAGIC, align the Data
       // to a page boundary
       if (isFirstSection &&
@@ -165,18 +165,17 @@ void Segment<ELFT>::assignFileOffsets(uint64_t startOffset) {
         // Align to a page only if the output is not
         // OutputMagic::NMAGIC/OutputMagic::OMAGIC
         if (alignSegments)
-          fileOffset = llvm::RoundUpToAlignment(fileOffset, p_align);
+          fileOffset = llvm::alignTo(fileOffset, p_align);
         // Align according to ELF spec.
         // in p75, http://www.sco.com/developers/devspecs/gabi41.pdf
         uint64_t virtualAddress = slice->virtualAddr();
         Section<ELFT> *sect = dyn_cast<Section<ELFT>>(section);
         if (sect && sect->isLoadableSection() &&
             ((virtualAddress & (p_align - 1)) != (fileOffset & (p_align - 1))))
-          fileOffset = llvm::RoundUpToAlignment(fileOffset, p_align) +
-                       (virtualAddress % p_align);
+          fileOffset =
+              llvm::alignTo(fileOffset, p_align) + (virtualAddress % p_align);
       } else if (!isDataPageAlignedForNMagic && needAlign(section)) {
-        fileOffset =
-            llvm::RoundUpToAlignment(fileOffset, this->_ctx.getPageSize());
+        fileOffset = llvm::alignTo(fileOffset, this->_ctx.getPageSize());
         isDataPageAlignedForNMagic = true;
       }
       if (isFirstSection) {
@@ -228,15 +227,15 @@ template <class ELFT> void Segment<ELFT>::assignVirtualAddress(uint64_t addr) {
         _outputMagic != ELFLinkingContext::OutputMagic::OMAGIC) {
       // Align to a page only if the output is not
       // OutputMagic::NMAGIC/OutputMagic::OMAGIC
-      startAddr = llvm::RoundUpToAlignment(startAddr, this->_ctx.getPageSize());
+      startAddr = llvm::alignTo(startAddr, this->_ctx.getPageSize());
     } else if (needAlign(*si)) {
       // If the linker outputmagic is set to OutputMagic::NMAGIC, align the
       // Data to a page boundary.
-      startAddr = llvm::RoundUpToAlignment(startAddr, this->_ctx.getPageSize());
+      startAddr = llvm::alignTo(startAddr, this->_ctx.getPageSize());
       isDataPageAlignedForNMagic = true;
     }
     // align the startOffset to the section alignment
-    uint64_t newAddr = llvm::RoundUpToAlignment(startAddr, (*si)->alignment());
+    uint64_t newAddr = llvm::alignTo(startAddr, (*si)->alignment());
     // Handle linker script expressions, which *may update newAddr* if the
     // expression assigns to "."
     if (auto expr = dyn_cast<ExpressionChunk<ELFT>>(*si))
@@ -248,8 +247,7 @@ template <class ELFT> void Segment<ELFT>::assignVirtualAddress(uint64_t addr) {
     // Handle TLS.
     if (auto section = dyn_cast<Section<ELFT>>(*si)) {
       if (section->getSegmentType() == llvm::ELF::PT_TLS) {
-        tlsStartAddr =
-            llvm::RoundUpToAlignment(tlsStartAddr, (*si)->alignment());
+        tlsStartAddr = llvm::alignTo(tlsStartAddr, (*si)->alignment());
         section->assignVirtualAddress(tlsStartAddr);
         tlsStartAddr += (*si)->memSize();
       } else {
@@ -278,11 +276,11 @@ template <class ELFT> void Segment<ELFT>::assignVirtualAddress(uint64_t addr) {
       // If the linker outputmagic is set to OutputMagic::NMAGIC, align the
       // Data
       // to a page boundary
-      curAddr = llvm::RoundUpToAlignment(curAddr, this->_ctx.getPageSize());
+      curAddr = llvm::alignTo(curAddr, this->_ctx.getPageSize());
       isDataPageAlignedForNMagic = true;
     }
-    uint64_t newAddr = llvm::RoundUpToAlignment(
-        forceScriptAddr ? scriptAddr : curAddr, (*si)->alignment());
+    uint64_t newAddr = llvm::alignTo(forceScriptAddr ? scriptAddr : curAddr,
+                                     (*si)->alignment());
     forceScriptAddr = false;
 
     // Handle linker script expressions, which may force an address change if
@@ -347,8 +345,7 @@ template <class ELFT> void Segment<ELFT>::assignVirtualAddress(uint64_t addr) {
       // Handle TLS.
       if (auto section = dyn_cast<Section<ELFT>>(*si)) {
         if (section->getSegmentType() == llvm::ELF::PT_TLS) {
-          tlsStartAddr =
-              llvm::RoundUpToAlignment(tlsStartAddr, (*si)->alignment());
+          tlsStartAddr = llvm::alignTo(tlsStartAddr, (*si)->alignment());
           section->assignVirtualAddress(tlsStartAddr);
           tlsStartAddr += (*si)->memSize();
         } else {
diff --git a/lld/lib/ReaderWriter/ELF/TargetLayout.cpp b/lld/lib/ReaderWriter/ELF/TargetLayout.cpp
index 09c49f62d64..9fb46bc599c 100644
--- a/lld/lib/ReaderWriter/ELF/TargetLayout.cpp
+++ b/lld/lib/ReaderWriter/ELF/TargetLayout.cpp
@@ -616,7 +616,7 @@ void TargetLayout<ELFT>::assignFileOffsetsForMiscSections() {
     section = dyn_cast<Section<ELFT>>(si);
     if (section && TargetLayout<ELFT>::hasOutputSegment(section))
       continue;
-    fileoffset = llvm::RoundUpToAlignment(fileoffset, si->alignment());
+    fileoffset = llvm::alignTo(fileoffset, si->alignment());
     si->setFileOffset(fileoffset);
     si->setVirtualAddr(0);
     fileoffset += si->fileSize();
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 4ecfece0629..4a54e4bb727 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -255,7 +255,7 @@ StringRef MachOFileLayout::dyldPath() {
 }
 
 uint32_t MachOFileLayout::pointerAlign(uint32_t value) {
-  return llvm::RoundUpToAlignment(value, _is64 ? 8 : 4);
+  return llvm::alignTo(value, _is64 ? 8 : 4);
 }
 
 
@@ -292,7 +292,7 @@ MachOFileLayout::MachOFileLayout(const NormalizedFile &file)
       if (isZeroFillSection(sect.type))
         _sectInfo[&sect].fileOffset = 0;
       else {
-        offset = llvm::RoundUpToAlignment(offset, sect.alignment);
+        offset = llvm::alignTo(offset, sect.alignment);
         _sectInfo[&sect].fileOffset = offset;
         offset += sect.content.size();
       }
@@ -539,10 +539,8 @@ void MachOFileLayout::buildFileOffsets() {
                   << ", fileOffset=" << fileOffset << "\n");
     }
 
-    _segInfo[&sg].fileSize = llvm::RoundUpToAlignment(segFileSize,
-                                                      _file.pageSize);
-    fileOffset = llvm::RoundUpToAlignment(fileOffset + segFileSize,
-                                          _file.pageSize);
+    _segInfo[&sg].fileSize = llvm::alignTo(segFileSize, _file.pageSize);
+    fileOffset = llvm::alignTo(fileOffset + segFileSize, _file.pageSize);
     _addressOfLinkEdit = sg.address + sg.size;
   }
   _startOfLinkEdit = fileOffset;
@@ -679,7 +677,7 @@ std::error_code MachOFileLayout::writeSegmentLoadCommands(uint8_t *&lc) {
   uint8_t *next = lc + cmd->cmdsize;
   setString16("__LINKEDIT", cmd->segname);
   cmd->vmaddr   = _addressOfLinkEdit;
-  cmd->vmsize   = llvm::RoundUpToAlignment(linkeditSize, _file.pageSize);
+  cmd->vmsize   = llvm::alignTo(linkeditSize, _file.pageSize);
   cmd->fileoff  = _startOfLinkEdit;
   cmd->filesize = linkeditSize;
   cmd->maxprot  = VM_PROT_READ;
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
index 575bc1a2b3a..b8e462631ee 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
@@ -465,10 +465,10 @@ void Util::organizeSections() {
 void Util::layoutSectionsInSegment(SegmentInfo *seg, uint64_t &addr) {
   seg->address = addr;
   for (SectionInfo *sect : seg->sections) {
-    sect->address = llvm::RoundUpToAlignment(addr, sect->alignment);
+    sect->address = llvm::alignTo(addr, sect->alignment);
     addr = sect->address + sect->size;
   }
-  seg->size = llvm::RoundUpToAlignment(addr - seg->address, _ctx.pageSize());
+  seg->size = llvm::alignTo(addr - seg->address, _ctx.pageSize());
 }
 
 // __TEXT segment lays out backwards so padding is at front after load commands.
@@ -488,10 +488,10 @@ void Util::layoutSectionsInTextSegment(size_t hlcSize, SegmentInfo *seg,
   // Start assigning section address starting at padded offset.
   addr += (padding + hlcSize);
   for (SectionInfo *sect : seg->sections) {
-    sect->address = llvm::RoundUpToAlignment(addr, sect->alignment);
+    sect->address = llvm::alignTo(addr, sect->alignment);
     addr = sect->address + sect->size;
   }
-  seg->size = llvm::RoundUpToAlignment(addr - seg->address, _ctx.pageSize());
+  seg->size = llvm::alignTo(addr - seg->address, _ctx.pageSize());
 }
 
 void Util::assignAddressesToSections(const NormalizedFile &file) {
@@ -511,7 +511,7 @@ void Util::assignAddressesToSections(const NormalizedFile &file) {
     } else
       layoutSectionsInSegment(seg, address);
 
-    address = llvm::RoundUpToAlignment(address, _ctx.pageSize());
+    address = llvm::alignTo(address, _ctx.pageSize());
   }
   DEBUG_WITH_TYPE("WriterMachO-norm",
     llvm::dbgs() << "assignAddressesToSections()\n";