Remove call to PNaClABIProps::isAllowedAlignment from subzero.

src/PNaClTranslator.cpp

 //===- subzero/src/PNaClTranslator.cpp - ICE from bitcode -----------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the PNaCl bitcode file to Ice, to machine code
 // translator.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/SmallString.h"
-#include "llvm/Analysis/NaCl/PNaClABIProps.h"
 #include "llvm/Bitcode/NaCl/NaClBitcodeDecoders.h"
 #include "llvm/Bitcode/NaCl/NaClBitcodeHeader.h"
 #include "llvm/Bitcode/NaCl/NaClBitcodeParser.h"
 #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
 #include "llvm/IR/Constants.h"
-#include "llvm/IR/DataLayout.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include "IceCfg.h"
 #include "IceCfgNode.h"
 #include "IceClFlags.h"
 #include "IceDefs.h"
@@ skipping 135 matching lines @@
   TopLevelParser(const TopLevelParser &) = delete;
   TopLevelParser &operator=(const TopLevelParser &) = delete;
 
 public:
   typedef std::vector<Ice::FunctionDeclaration *> FunctionDeclarationListType;
 
   TopLevelParser(Ice::Translator &Translator, const std::string &InputName,
                  NaClBitcodeHeader &Header, NaClBitstreamCursor &Cursor,
                  bool &ErrorStatus)
       : NaClBitcodeParser(Cursor), Translator(Translator),
-        Mod(new Module(InputName, getGlobalContext())), DL(PNaClDataLayout),
+        Mod(new Module(InputName, getGlobalContext())),
         Header(Header), TypeConverter(Mod->getContext()),
         ErrorStatus(ErrorStatus), NumErrors(0), NumFunctionIds(0),
         NumFunctionBlocks(0), BlockParser(nullptr) {
-    Mod->setDataLayout(PNaClDataLayout);
     setErrStream(Translator.getContext()->getStrDump());
   }
 
   ~TopLevelParser() override {}
 
   Ice::Translator &getTranslator() { return Translator; }
 
   void setBlockParser(BlockParserBaseClass *NewBlockParser) {
     BlockParser = NewBlockParser;
   }
 
   // Generates error with given Message. Always returns true.
   bool Error(const std::string &Message) override;
 
   // Generates error message with respect to the current block parser.
   bool BlockError(const std::string &Message);
 
   /// Returns the number of errors found while parsing the bitcode
   /// file.
   unsigned getNumErrors() const { return NumErrors; }
 
   /// Returns the LLVM module associated with the translation.
   Module *getModule() const { return Mod.get(); }
 
-  const DataLayout &getDataLayout() const { return DL; }
-
   /// Returns the number of bytes in the bitcode header.
   size_t getHeaderSize() const { return Header.getHeaderSize(); }
 
   /// Changes the size of the type list to the given size.
   void resizeTypeIDValues(unsigned NewSize) { TypeIDValues.resize(NewSize); }
 
   /// Returns true if generation of Subzero IR is disabled.
   bool isIRGenerationDisabled() const {
     return ALLOW_DISABLE_IR_GEN ? Translator.getFlags().DisableIRGeneration
                                 : false;
@@ skipping 179 matching lines @@
   /// Returns the model for pointer types in ICE.
   Ice::Type getIcePointerType() const {
     return TypeConverter.getIcePointerType();
   }
 
 private:
   // The translator associated with the parser.
   Ice::Translator &Translator;
   // The parsed module.
   std::unique_ptr<Module> Mod;
-  // The data layout to use.
-  DataLayout DL;
   // The bitcode header.
   NaClBitcodeHeader &Header;
   // Converter between LLVM and ICE types.
   Ice::TypeConverter TypeConverter;
   // The exit status that should be set to true if an error occurs.
   bool &ErrorStatus;
   // The number of errors reported.
   unsigned NumErrors;
   // The types associated with each type ID.
   std::vector<ExtendedType> TypeIDValues;
@@ skipping 1015 matching lines @@
     std::string Buffer;
     raw_string_ostream StrBuf(Buffer);
     StrBuf << InstructionName << " type not allowed: " << Ty << "*";
     Error(StrBuf.str());
     return false;
   }
 
   // Checks if loading/storing a value of type Ty is allowed for
   // the given Alignment. Otherwise generates an error message and
   // returns false.
-  bool isValidLoadStoreAlignment(unsigned Alignment, Ice::Type Ty,
+  bool isValidLoadStoreAlignment(size_t Alignment, Ice::Type Ty,

[Jim Stichnoth, 2014/12/08 23:14:47]

If you change the type of Alignment, should you also propagate the change back
to the callers, etc.?

[Karl, 2014/12/09 21:20:45]

Done.

                                  const char *InstructionName) {
     if (!isValidLoadStoreType(Ty, InstructionName))
       return false;
-    if (PNaClABIProps::isAllowedAlignment(&Context->getDataLayout(), Alignment,
-                                          Context->convertToLLVMType(Ty)))
-      return true;
+    if (isAllowedAlignment(Alignment, Ty)) return true;

[Jim Stichnoth, 2014/12/08 23:14:47]

return on separate line (i.e., make format-diff)

[Karl, 2014/12/09 21:20:45]

Done.

     std::string Buffer;
     raw_string_ostream StrBuf(Buffer);
     StrBuf << InstructionName << " " << Ty << "*: not allowed for alignment "
            << Alignment;
     Error(StrBuf.str());
     return false;
   }
 
+  // Defines if the given alignment is valid for the given type. Simplified
+  // version of PNaClABIProps::isAllowedAlignment, based on API's offered
+  // for Ice::Type.
+  bool isAllowedAlignment(size_t Alignment, Ice::Type Ty) {

[Jim Stichnoth, 2014/12/08 23:14:47]

Can this be const?

[Karl, 2014/12/09 21:20:45]

Done.

+    return Alignment == typeAlignInBytes(Ty) ||

[Jim Stichnoth, 2014/12/08 23:14:47]

This implementation doesn't seem to match the original implementation, in
particular PNaClABIProps contains the comment:

  // Non-atomic integer operations must always use "align 1", since we do not
  // want the backend to generate code with non-portable undefined behaviour
  // (such as misaligned access faults) if user code specifies "align 4" but
  // uses a misaligned pointer.

Which one is correct?

[Karl, 2014/12/09 21:20:45]

This code doesn't match the comment (which is out of date), but it does match
the implementation. Further, it matches the PNaClABI documentation.

[Jim Stichnoth, 2014/12/09 21:48:24]

Thanks, my world-view is restored. :)

+        (Alignment == 1 && !isVectorType(Ty));
+  }
+
   // Types of errors that can occur for insertelement and extractelement
   // instructions.
   enum VectorIndexCheckValue {
     VectorIndexNotVector,
     VectorIndexNotConstant,
     VectorIndexNotInRange,
     VectorIndexNotI32,
     VectorIndexValid
   };
 
@@ skipping 1472 matching lines @@
 
   if (TopLevelBlocks != 1) {
     errs() << IRFilename
            << ": Contains more than one module. Found: " << TopLevelBlocks
            << "\n";
     ErrorStatus = true;
   }
 }
 
 } // end of namespace Ice