summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/X86/X86InstrInfo.cpp
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2017-04-21 20:58:12 +0000
committerHans Wennborg <hans@hanshq.net>2017-04-21 20:58:12 +0000
commitcb3e81071495dd2f63af38f6b50945a47939f9d7 (patch)
tree7826b28b7b5818fd416502e8c46a184c8188ce39 /llvm/lib/Target/X86/X86InstrInfo.cpp
parent79873efcfb3ae8c4da5f8c6855105a9e496ce1f7 (diff)
downloadbcm5719-llvm-cb3e81071495dd2f63af38f6b50945a47939f9d7.tar.gz
bcm5719-llvm-cb3e81071495dd2f63af38f6b50945a47939f9d7.zip
X86: Don't emit zero-byte functions on Windows
Empty functions can lead to duplicate entries in the Guard CF Function Table of a binary due to multiple functions sharing the same RVA, causing the kernel to refuse to load that binary. We had a terrific bug due to this in Chromium. It turns out we were already doing this for Mach-O in certain situations. This patch expands the code for that in AsmPrinter::EmitFunctionBody() and renames TargetInstrInfo::getNoopForMachoTarget() to simply getNoop() since it seems it was used for not just Mach-O anyway. Differential Revision: https://reviews.llvm.org/D32330 llvm-svn: 301040
Diffstat (limited to 'llvm/lib/Target/X86/X86InstrInfo.cpp')
-rw-r--r--llvm/lib/Target/X86/X86InstrInfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index 7b456fd6834..7e69e945c75 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -9514,7 +9514,7 @@ void X86InstrInfo::setExecutionDomain(MachineInstr &MI, unsigned Domain) const {
}
/// Return the noop instruction to use for a noop.
-void X86InstrInfo::getNoopForMachoTarget(MCInst &NopInst) const {
+void X86InstrInfo::getNoop(MCInst &NopInst) const {
NopInst.setOpcode(X86::NOOP);
}
OpenPOWER on IntegriCloud