commit f217ef0d75a4438f610764e582823ffd4807d75d
author Rui Ueyama <ruiu@google.com> Thu Mar 26 02:03:44 2015 +0000
committer Rui Ueyama <ruiu@google.com> Thu Mar 26 02:03:44 2015 +0000
tree 046816af6939a27aa592028ee9effc5fc4e3d92a
parent f006f4d62c9375288f25870f2b020609d67f6b11

Use alignment values everywhere instead of log2.

This patch defines implicit conversion between integers and PowerOf2
instances, so uses of the classes is now implicit and look like
regular integers. Now we are ready to remove the scaffolding.

llvm-svn: 233245

lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp

diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 0f8bba4..5d85189 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -291,7 +291,7 @@
     uint64_t offset = _startOfSectionsContent;
     for (const Section &sect : file.sections) {
       if (sect.type != llvm::MachO::S_ZEROFILL) {
-        offset = llvm::RoundUpToAlignment(offset, sect.alignment.get());
+        offset = llvm::RoundUpToAlignment(offset, sect.alignment);
         _sectInfo[&sect].fileOffset = offset;
         offset += sect.content.size();
       } else {
@@ -613,7 +613,7 @@
     sout->addr = sin.address;
     sout->size = sin.content.size();
     sout->offset = _sectInfo[&sin].fileOffset;
-    sout->align = llvm::Log2_32(sin.alignment.get());
+    sout->align = llvm::Log2_32(sin.alignment);
     sout->reloff = sin.relocations.empty() ? 0 : relOffset;
     sout->nreloc = sin.relocations.size();
     sout->flags = sin.type | sin.attributes;
@@ -661,7 +661,7 @@
         sect->offset  = 0;
       else
         sect->offset  = section->address - seg.address + segInfo.fileOffset;
-      sect->align     = llvm::Log2_32(section->alignment.get());
+      sect->align     = llvm::Log2_32(section->alignment);
       sect->reloff    = 0;
       sect->nreloc    = 0;
       sect->flags     = section->type | section->attributes;