diff options
| author | Chris Lattner <sabre@nondot.org> | 2007-04-09 03:37:36 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2007-04-09 03:37:36 +0000 |
| commit | 39a6a36c5adf25b174e5381ea769264767e90582 (patch) | |
| tree | fed8e254b2f05d3c67422ea22e1b64d2b1fa47c4 /lib/Bytecode | |
| parent | 3d6b71eb674be6e0e2f342b36ff35be3c7f78cb5 (diff) | |
Fix a bug that caused alignment information to occasionally get stripped off
of an allocation instruction when writing to bytecode.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35796 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Bytecode')
| -rw-r--r-- | lib/Bytecode/Writer/Writer.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp index e0aa110d5c..925ae1f464 100644 --- a/lib/Bytecode/Writer/Writer.cpp +++ b/lib/Bytecode/Writer/Writer.cpp @@ -429,8 +429,14 @@ void BytecodeWriter::outputInstructionFormat0(const Instruction *I, output_typeid(Type); // Result type unsigned NumArgs = I->getNumOperands(); - output_vbr(NumArgs + (isa<CastInst>(I) || isa<InvokeInst>(I) || - isa<CmpInst>(I) || isa<VAArgInst>(I) || Opcode == 58)); + bool HasExtraArg = false; + if (isa<CastInst>(I) || isa<InvokeInst>(I) || + isa<CmpInst>(I) || isa<VAArgInst>(I) || Opcode == 58) + HasExtraArg = true; + if (const AllocationInst *AI = dyn_cast<AllocationInst>(I)) + HasExtraArg = AI->getAlignment() != 0; + + output_vbr(NumArgs + HasExtraArg); if (!isa<GetElementPtrInst>(&I)) { for (unsigned i = 0; i < NumArgs; ++i) @@ -445,6 +451,9 @@ void BytecodeWriter::outputInstructionFormat0(const Instruction *I, } else if (Opcode == 58) { // Call escape sequence output_vbr((cast<CallInst>(I)->getCallingConv() << 1) | unsigned(cast<CallInst>(I)->isTailCall())); + } else if (const AllocationInst *AI = dyn_cast<AllocationInst>(I)) { + if (AI->getAlignment()) + output_vbr((unsigned)Log2_32(AI->getAlignment())+1); } } else { output_vbr(Table.getSlot(I->getOperand(0))); |