Make the augmentation size and next set of bytes agree on size,

and make the reference pointer size as it should be.

Fixes an abort on a testcase derived from libunwind's personality
test in 64-bit.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80414 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2009-08-29 01:12:46 +00:00
parent 91dc33ae8f
commit 6fefcebc4f

View File

@ -204,13 +204,19 @@ void DwarfException::EmitFDE(const FunctionEHFrameInfo &EHFrameInfo) {
// If there is a personality and landing pads then point to the language // If there is a personality and landing pads then point to the language
// specific data area in the exception table. // specific data area in the exception table.
if (MMI->getPersonalities()[0] != NULL) { if (MMI->getPersonalities()[0] != NULL) {
Asm->EmitULEB128Bytes(4); bool is4Byte = TD->getPointerSize() == sizeof(int32_t);
Asm->EmitULEB128Bytes(is4Byte ? 4 : 8);
Asm->EOL("Augmentation size"); Asm->EOL("Augmentation size");
if (EHFrameInfo.hasLandingPads) if (EHFrameInfo.hasLandingPads)
EmitReference("exception", EHFrameInfo.Number, true, true); EmitReference("exception", EHFrameInfo.Number, true, false);
else else {
if (is4Byte)
Asm->EmitInt32((int)0); Asm->EmitInt32((int)0);
else
Asm->EmitInt64((int)0);
}
Asm->EOL("Language Specific Data Area"); Asm->EOL("Language Specific Data Area");
} else { } else {
Asm->EmitULEB128Bytes(0); Asm->EmitULEB128Bytes(0);