Merge pull request #15567 from JuliaLang/yyc/llvm39

Fix compilation on LLVM 3.8
JuliaLang · Mar 20, 2016 · a013532 · a013532
2 parents 05bdbb0 + 68dce26
commit a013532
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -1510,10 +1510,7 @@ static uint64_t compute_obj_symsize(const object::ObjectFile *obj, uint64_t offs
         object::SectionRef Section = *I;
 #endif
         uint64_t SAddr, SSize;
-#ifdef LLVM38
-        SAddr = Section.getAddress().get();
-        SSize = Section.getSize().get();
-#elif defined(LLVM36)
+#ifdef LLVM36
         SAddr = Section.getAddress();
         SSize = Section.getSize();
 #else

diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
@@ -377,13 +377,12 @@ class JuliaJITEventListener: public JITEventListener
 #endif
             if (Section == EndSection) continue;
             if (!Section->isText()) continue;
+            uint64_t SectionAddr = Section->getAddress();
 #ifdef LLVM38
-            uint64_t SectionAddr = Section->getAddress().get();
             uint64_t SectionLoadAddr = L.getSectionLoadAddress(*Section);
 #else
             StringRef secName;
             Section->getName(secName);
-            uint64_t SectionAddr = Section->getAddress();
             uint64_t SectionLoadAddr = L.getSectionLoadAddress(secName);
 #endif
             Addr -= SectionAddr - SectionLoadAddr;