* Constantify arguments to copy function
* Stop using a #define, make it an inline if statement
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8678 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp
index 2773d36..4931e12 100644
--- a/lib/Bytecode/Reader/ReaderWrappers.cpp
+++ b/lib/Bytecode/Reader/ReaderWrappers.cpp
@@ -11,11 +11,6 @@
#include "Config/unistd.h"
#include "Config/sys/mman.h"
-#define CHECK_ALIGN32(begin,end) \
- if (align32(begin,end)) \
- throw std::string("Alignment error: ReaderWrappers.cpp:" + \
- utostr((unsigned)__LINE__));
-
namespace {
/// BytecodeFileReader - parses a bytecode file from a file
@@ -26,7 +21,7 @@
int Length;
BytecodeFileReader(const BytecodeFileReader&); // Do not implement
- void operator=(BytecodeFileReader &BFR); // Do not implement
+ void operator=(const BytecodeFileReader &BFR); // Do not implement
public:
BytecodeFileReader(const std::string &Filename);
@@ -42,7 +37,7 @@
unsigned char *FileBuf;
BytecodeStdinReader(const BytecodeStdinReader&); // Do not implement
- void operator=(BytecodeStdinReader &BFR); // Do not implement
+ void operator=(const BytecodeStdinReader &BFR); // Do not implement
public:
BytecodeStdinReader();
@@ -143,7 +138,8 @@
AbstractModuleProvider*
getBytecodeBufferModuleProvider(const unsigned char *Buffer, unsigned Length,
const std::string &ModuleID) {
- CHECK_ALIGN32(Buffer, Buffer+Length);
+ if (align32(Buffer, Buffer+Length)
+ throw std::string("Unaligned bytecode buffer.");
BytecodeParser *Parser = new BytecodeParser();
Parser->ParseBytecode(Buffer, Length, ModuleID);
return Parser;