diff options
| author | Bill Wendling <isanbard@gmail.com> | 2009-12-17 20:41:01 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2009-12-17 20:41:01 +0000 |
| commit | aeb79aea8f4761f1c46731ac6bd58cbccdcfa097 (patch) | |
| tree | b15405a4e3dd74fea998fefd4728f40f1725cf99 /lib | |
| parent | b2273d50bc37caabf5aa6703d10c3fe34b6f06cb (diff) | |
| download | external_llvm-aeb79aea8f4761f1c46731ac6bd58cbccdcfa097.zip external_llvm-aeb79aea8f4761f1c46731ac6bd58cbccdcfa097.tar.gz external_llvm-aeb79aea8f4761f1c46731ac6bd58cbccdcfa097.tar.bz2 | |
Temporarily revert 91337. It's causing testcase failures.
$ svn merge -c -91337 https://llvm.org/svn/llvm-project/llvm/trunk
--- Reverse-merging r91337 into '.':
U lib/CodeGen/AsmPrinter/DwarfException.cpp
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91618 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfException.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp index 3fd077f..1c8b8f4 100644 --- a/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -292,13 +292,14 @@ void DwarfException::EmitFDE(const FunctionEHFrameInfo &EHFrameInfo) { Asm->EmitULEB128Bytes(is4Byte ? 4 : 8); Asm->EOL("Augmentation size"); - // We force 32-bits here because we've encoded our LSDA in the CIE with - // `dwarf::DW_EH_PE_sdata4'. And the CIE and FDE should agree. if (EHFrameInfo.hasLandingPads) - EmitReference("exception", EHFrameInfo.Number, true, true); - else - Asm->EmitInt32((int)0); - + EmitReference("exception", EHFrameInfo.Number, true, false); + else { + if (is4Byte) + Asm->EmitInt32((int)0); + else + Asm->EmitInt64((int)0); + } Asm->EOL("Language Specific Data Area"); } else { Asm->EmitULEB128Bytes(0); |