commit a4d22472f35195e04f39caa3a42b0141ed49a4f1
author Rafael Espindola <rafael.espindola@gmail.com> Sun May 31 23:52:50 2015 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Sun May 31 23:52:50 2015 +0000
tree ca274439f7034b85f4a1d7baaf1acf3d481f8e27
parent c2c6018cce299d57512294e22a16459d1e56bd33

Simplify interface of function that doesn't fail.

llvm-svn: 238700

llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index 8953509..ad6c6ae 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -494,9 +494,8 @@
       continue;
     }
 
-    uint32_t Align = 0;
+    uint32_t Align = Sym.getAlignment();
     uint64_t Size = 0;
-    Check(Sym.getAlignment(Align));
     Check(Sym.getSize(Size));
 
     CommonSize += Align + Size;
@@ -518,10 +517,9 @@
 
   // Assign the address of each symbol
   for (auto &Sym : SymbolsToAllocate) {
-    uint32_t Align;
+    uint32_t Align = Sym.getAlignment();
     uint64_t Size;
     StringRef Name;
-    Check(Sym.getAlignment(Align));
     Check(Sym.getSize(Size));
     Check(Sym.getName(Name));
     if (Align) {

llvm/lib/Object/MachOObjectFile.cpp

diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index 439dceb..cae5b79 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -401,16 +401,13 @@
   return object_error::success;
 }
 
-std::error_code MachOObjectFile::getSymbolAlignment(DataRefImpl DRI,
-                                                    uint32_t &Result) const {
+uint32_t MachOObjectFile::getSymbolAlignment(DataRefImpl DRI) const {
   uint32_t flags = getSymbolFlags(DRI);
   if (flags & SymbolRef::SF_Common) {
     MachO::nlist_base Entry = getSymbolTableEntryBase(this, DRI);
-    Result = 1 << MachO::GET_COMM_ALIGN(Entry.n_desc);
-  } else {
-    Result = 0;
+    return 1 << MachO::GET_COMM_ALIGN(Entry.n_desc);
   }
-  return object_error::success;
+  return 0;
 }
 
 std::error_code MachOObjectFile::getSymbolSize(DataRefImpl DRI,

llvm/lib/Object/ObjectFile.cpp

diff --git a/llvm/lib/Object/ObjectFile.cpp b/llvm/lib/Object/ObjectFile.cpp
index 01b7654..0950c7d 100644
--- a/llvm/lib/Object/ObjectFile.cpp
+++ b/llvm/lib/Object/ObjectFile.cpp
@@ -37,11 +37,7 @@
   return object_error::success;
 }
 
-std::error_code ObjectFile::getSymbolAlignment(DataRefImpl DRI,
-                                               uint32_t &Result) const {
-  Result = 0;
-  return object_error::success;
-}
+uint32_t ObjectFile::getSymbolAlignment(DataRefImpl DRI) const { return 0; }
 
 section_iterator ObjectFile::getRelocatedSection(DataRefImpl Sec) const {
   return section_iterator(SectionRef(Sec, this));