6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

[AsmPrinter] Fix crash in handleIndirectSymViaGOTPCRel

Browse Source 
Check for symbols in MCValue before using them. Bail out early in case
they are null. This fixes PR23779.

Differential Revision: http://reviews.llvm.org/D10712

rdar://problem/21532830

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240649 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bruno Cardoso Lopes 2015-06-25 15:17:23 +00:00
parent 8eb93196be
commit 39b2e22f00
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -2086,8 +2086,12 @@ static void handleIndirectSymViaGOTPCRel(AsmPrinter &AP, const MCExpr **ME,
MCValue MV; MCValue MV;
if (!(*ME)->evaluateAsRelocatable(MV, nullptr, nullptr) || MV.isAbsolute()) if (!(*ME)->evaluateAsRelocatable(MV, nullptr, nullptr) || MV.isAbsolute())
return; return;
const MCSymbolRefExpr *SymA = MV.getSymA();
if (!SymA)
return;
const MCSymbol *GOTEquivSym = &MV.getSymA()->getSymbol(); // Check that GOT equivalent symbol is cached.
const MCSymbol *GOTEquivSym = &SymA->getSymbol();
if (!AP.GlobalGOTEquivs.count(GOTEquivSym)) if (!AP.GlobalGOTEquivs.count(GOTEquivSym))
return; return;
@ -2095,8 +2099,11 @@ static void handleIndirectSymViaGOTPCRel(AsmPrinter &AP, const MCExpr **ME,
if (!BaseGV) if (!BaseGV)
return; return;
// Check for a valid base symbol
const MCSymbol *BaseSym = AP.getSymbol(BaseGV); const MCSymbol *BaseSym = AP.getSymbol(BaseGV);
if (BaseSym != &MV.getSymB()->getSymbol()) const MCSymbolRefExpr *SymB = MV.getSymB();
if (!SymB || BaseSym != &SymB->getSymbol())
return; return;
// Make sure to match: // Make sure to match:

9
test/MC/MachO/cstexpr-gotpcrel-64.ll
View File

@ -84,3 +84,12 @@ define i32 @t0(i32 %a) {
define i32** @t1() { define i32** @t1() {
ret i32** @bargotequiv ret i32** @bargotequiv
} }
; Do not crash when a pattern cannot be matched as a GOT equivalent
@a = external global i8
@b = internal unnamed_addr constant i8* @a
; X86-LABEL: _c:
; X86: .quad _b
@c = global i8** @b