maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[AsmPrinter] Check for valid constants in handleIndirectSymViaGOTPCRel 

Check whether BaseCst is valid before extracting a GlobalValue.
This fixes PR24163.

Patch by David Majnemer.

llvm-svn: 242840
This commit is contained in:
Bruno Cardoso Lopes 2015-07-21 21:45:42 +00:00
parent 402a4f1088
commit e8640518a9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -2101,7 +2101,7 @@ static void handleIndirectSymViaGOTPCRel(AsmPrinter &AP, const MCExpr **ME,
if (!AP.GlobalGOTEquivs.count(GOTEquivSym)) if (!AP.GlobalGOTEquivs.count(GOTEquivSym))
return; return;
const GlobalValue *BaseGV = dyn_cast<GlobalValue>(BaseCst); const GlobalValue *BaseGV = dyn_cast_or_null<GlobalValue>(BaseCst);
if (!BaseGV) if (!BaseGV)
return; return;

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

@ -1,6 +1,7 @@
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t
; RUN: FileCheck %s -check-prefix=X86 < %t ; RUN: FileCheck %s -check-prefix=X86 < %t
; RUN: FileCheck %s -check-prefix=X86-GOT-EQUIV < %t ; RUN: FileCheck %s -check-prefix=X86-GOT-EQUIV < %t
; RUN: FileCheck %s -check-prefix=X86-NOGOT-EQUIV < %t
; GOT equivalent globals references can be replaced by the GOT entry of the ; GOT equivalent globals references can be replaced by the GOT entry of the
; final symbol instead. ; final symbol instead.
@ -86,10 +87,15 @@ define i32** @t1() {
} }
; Do not crash when a pattern cannot be matched as a GOT equivalent ; Do not crash when a pattern cannot be matched as a GOT equivalent
define void @foo() {
; X86-NOGOT-EQUIV-LABEL: _foo:
; X86-NOGOT-EQUIV: leaq _b(%rip), %rax
store i8** @b, i8*** null
ret void
}
@a = external global i8 @a = external global i8
@b = internal unnamed_addr constant i8* @a @b = internal unnamed_addr constant i8* @a
; X86-LABEL: _c: ; X86-NOGOT-EQUIV-LABEL: _c:
; X86: .quad _b ; X86-NOGOT-EQUIV: .quad _b
@c = global i8** @b @c = global i8** @b