Subzero. ARM32. Nonsfi.

src/IceELFObjectWriter.cpp

 //===- subzero/src/IceELFObjectWriter.cpp - ELF object file writer --------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Defines the writer for ELF relocatable object files.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "IceELFObjectWriter.h"
 
 #include "IceAssembler.h"
 #include "IceDefs.h"
 #include "IceELFSection.h"
 #include "IceELFStreamer.h"
 #include "IceGlobalContext.h"
 #include "IceGlobalInits.h"
 #include "IceInst.h"
 #include "IceOperand.h"
+
 #include "llvm/Support/MathExtras.h"
-
-using namespace llvm::ELF;
+#include "llvm/Support/ELF.h"

[Jim Stichnoth, 2016/02/10 06:36:00]

alphabetical order

[John, 2016/02/10 15:41:13]

Done.

 
 namespace Ice {
 
 namespace {
 
 constexpr struct {
   bool IsELF64;
   uint16_t ELFMachine;
   uint32_t ELFFlags;
 } ELFTargetInfo[TargetArch_NUM] = {
@@ skipping 374 matching lines @@
           const auto &Data =
               llvm::cast<VariableDeclaration::DataInitializer>(Init.get())
                   ->getContents();
           Section->appendData(Str, llvm::StringRef(Data.data(), Data.size()));
           break;
         }
         case VariableDeclaration::Initializer::ZeroInitializerKind:
           Section->appendZeros(Str, Init->getNumBytes());
           break;
         case VariableDeclaration::Initializer::RelocInitializerKind: {
-          const auto Reloc =
+          const auto *Reloc =

[Jim Stichnoth, 2016/02/10 06:36:00]

Cool.  If you think it's appropriate, there are a couple other fixes like this,
in a couple different files:

  git grep 'auto[^*&]*=$'

[John, 2016/02/10 15:41:13]

Noted. Expect a cl later today with this fix.

               llvm::cast<VariableDeclaration::RelocInitializer>(Init.get());
           AssemblerFixup NewFixup;
           NewFixup.set_position(Section->getCurrentSize());
-          NewFixup.set_kind(RelocationKind);
+          NewFixup.set_kind(Reloc->hasFixup() ? Reloc->getFixup()
+                                              : RelocationKind);
+          assert(NewFixup.kind() != llvm::ELF::R_ARM_NONE);
           constexpr bool SuppressMangling = true;
           NewFixup.set_value(Ctx.getConstantSym(
               Reloc->getOffset(), Reloc->getDeclaration()->mangleName(&Ctx),
               SuppressMangling));
           RelSection->addRelocation(NewFixup);
           Section->appendRelocationOffset(Str, RelSection->isRela(),
                                           Reloc->getOffset());
           break;
         }
         }
@@ skipping 251 matching lines @@
   if (ELF64) {
     writeELFHeaderInternal<true>(ShOffset, ShStrTab->getNumber(),
                                  AllSections.size());
   } else {
     writeELFHeaderInternal<false>(ShOffset, ShStrTab->getNumber(),
                                   AllSections.size());
   }
 }
 
 } // end of namespace Ice