<div dir="ltr">Hi Rafael,<div><br></div><div>This caused some Darwin ObjC++/AArch64 test cases to fail during object emission. I've reverted this in r225311 to get the bots green while I try to reduce a test case. As soon as I have one I'll file a PR and attach it. Sorry for the hassle!</div><div><br></div><div>Cheers,</div><div>Lang.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 29, 2014 at 7:18 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Mon Dec 29 09:18:31 2014<br>
New Revision: 224935<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=224935&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=224935&view=rev</a><br>
Log:<br>
Refactor duplicated code.<br>
<br>
No intended functionality change.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h<br>
llvm/trunk/include/llvm/MC/MCAsmBackend.h<br>
llvm/trunk/include/llvm/MC/MCAsmInfo.h<br>
llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h<br>
llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h<br>
llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp<br>
llvm/trunk/lib/MC/MCAsmInfo.cpp<br>
llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp<br>
llvm/trunk/lib/MC/MCAssembler.cpp<br>
llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h<br>
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h<br>
llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp<br>
llvm/trunk/lib/Target/TargetMachine.cpp<br>
llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp<br>
llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h<br>
<br>
Modified: llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h (original)<br>
+++ llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h Mon Dec 29 09:18:31 2014<br>
@@ -89,8 +89,6 @@ public:<br>
ArrayRef<Module::ModuleFlagEntry> ModuleFlags,<br>
Mangler &Mang, const TargetMachine &TM) const override;<br>
<br>
- bool isSectionAtomizableBySymbols(const MCSection &Section) const override;<br>
-<br>
const MCSection *<br>
SelectSectionForGlobal(const GlobalValue *GV,<br>
SectionKind Kind, Mangler &Mang,<br>
<br>
Modified: llvm/trunk/include/llvm/MC/MCAsmBackend.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmBackend.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmBackend.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/MC/MCAsmBackend.h (original)<br>
+++ llvm/trunk/include/llvm/MC/MCAsmBackend.h Mon Dec 29 09:18:31 2014<br>
@@ -67,14 +67,6 @@ public:<br>
return false;<br>
}<br>
<br>
- /// isSectionAtomizable - Check whether the given section can be split into<br>
- /// atoms.<br>
- ///<br>
- /// \see MCAssembler::isSymbolLinkerVisible().<br>
- virtual bool isSectionAtomizable(const MCSection &Section) const {<br>
- return true;<br>
- }<br>
-<br>
/// @name Target Fixup Interfaces<br>
/// @{<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/MC/MCAsmInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/MC/MCAsmInfo.h (original)<br>
+++ llvm/trunk/include/llvm/MC/MCAsmInfo.h Mon Dec 29 09:18:31 2014<br>
@@ -382,6 +382,12 @@ public:<br>
return nullptr;<br>
}<br>
<br>
+ /// \brief True if the section is atomized using the symbols in it.<br>
+ /// This is false if the section is not atomized at all (most ELF sections) or<br>
+ /// if it is atomized based on its contents (MachO' __TEXT,__cstring for<br>
+ /// example).<br>
+ virtual bool isSectionAtomizableBySymbols(const MCSection &Section) const;<br>
+<br>
virtual const MCExpr *getExprForPersonalitySymbol(const MCSymbol *Sym,<br>
unsigned Encoding,<br>
MCStreamer &Streamer) const;<br>
<br>
Modified: llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h (original)<br>
+++ llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h Mon Dec 29 09:18:31 2014<br>
@@ -19,9 +19,9 @@<br>
<br>
namespace llvm {<br>
class MCAsmInfoDarwin : public MCAsmInfo {<br>
- virtual void anchor();<br>
public:<br>
explicit MCAsmInfoDarwin();<br>
+ bool isSectionAtomizableBySymbols(const MCSection &Section) const override;<br>
};<br>
}<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h (original)<br>
+++ llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h Mon Dec 29 09:18:31 2014<br>
@@ -151,12 +151,6 @@ public:<br>
return nullptr;<br>
}<br>
<br>
- /// \brief True if the section is atomized using the symbols in it.<br>
- /// This is false if the section is not atomized at all (most ELF sections) or<br>
- /// if it is atomized based on its contents (MachO' __TEXT,__cstring for<br>
- /// example).<br>
- virtual bool isSectionAtomizableBySymbols(const MCSection &Section) const;<br>
-<br>
protected:<br>
virtual const MCSection *<br>
SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,<br>
<br>
Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Mon Dec 29 09:18:31 2014<br>
@@ -573,60 +573,6 @@ const MCSection *TargetLoweringObjectFil<br>
return S;<br>
}<br>
<br>
-bool TargetLoweringObjectFileMachO::isSectionAtomizableBySymbols(<br>
- const MCSection &Section) const {<br>
- const MCSectionMachO &SMO = static_cast<const MCSectionMachO&>(Section);<br>
-<br>
- // Sections holding 1 byte strings are atomized based on the data<br>
- // they contain.<br>
- // Sections holding 2 byte strings require symbols in order to be<br>
- // atomized.<br>
- // There is no dedicated section for 4 byte strings.<br>
- if (SMO.getKind().isMergeable1ByteCString())<br>
- return false;<br>
-<br>
- if (SMO.getSegmentName() == "__TEXT" &&<br>
- SMO.getSectionName() == "__objc_classname" &&<br>
- SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
- return false;<br>
-<br>
- if (SMO.getSegmentName() == "__TEXT" &&<br>
- SMO.getSectionName() == "__objc_methname" &&<br>
- SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
- return false;<br>
-<br>
- if (SMO.getSegmentName() == "__TEXT" &&<br>
- SMO.getSectionName() == "__objc_methtype" &&<br>
- SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
- return false;<br>
-<br>
- if (SMO.getSegmentName() == "__DATA" &&<br>
- SMO.getSectionName() == "__cfstring")<br>
- return false;<br>
-<br>
- // no_dead_strip sections are not atomized in practice.<br>
- if (SMO.hasAttribute(MachO::S_ATTR_NO_DEAD_STRIP))<br>
- return false;<br>
-<br>
- switch (SMO.getType()) {<br>
- default:<br>
- return true;<br>
-<br>
- // These sections are atomized at the element boundaries without using<br>
- // symbols.<br>
- case MachO::S_4BYTE_LITERALS:<br>
- case MachO::S_8BYTE_LITERALS:<br>
- case MachO::S_16BYTE_LITERALS:<br>
- case MachO::S_LITERAL_POINTERS:<br>
- case MachO::S_NON_LAZY_SYMBOL_POINTERS:<br>
- case MachO::S_LAZY_SYMBOL_POINTERS:<br>
- case MachO::S_MOD_INIT_FUNC_POINTERS:<br>
- case MachO::S_MOD_TERM_FUNC_POINTERS:<br>
- case MachO::S_INTERPOSING:<br>
- return false;<br>
- }<br>
-}<br>
-<br>
const MCSection *TargetLoweringObjectFileMachO::<br>
SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,<br>
Mangler &Mang, const TargetMachine &TM) const {<br>
<br>
Modified: llvm/trunk/lib/MC/MCAsmInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfo.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfo.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/MC/MCAsmInfo.cpp (original)<br>
+++ llvm/trunk/lib/MC/MCAsmInfo.cpp Mon Dec 29 09:18:31 2014<br>
@@ -109,6 +109,10 @@ MCAsmInfo::MCAsmInfo() {<br>
MCAsmInfo::~MCAsmInfo() {<br>
}<br>
<br>
+bool MCAsmInfo::isSectionAtomizableBySymbols(const MCSection &Section) const {<br>
+ return false;<br>
+}<br>
+<br>
const MCExpr *<br>
MCAsmInfo::getExprForPersonalitySymbol(const MCSymbol *Sym,<br>
unsigned Encoding,<br>
<br>
Modified: llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp (original)<br>
+++ llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp Mon Dec 29 09:18:31 2014<br>
@@ -15,10 +15,61 @@<br>
#include "llvm/MC/MCAsmInfoDarwin.h"<br>
#include "llvm/MC/MCContext.h"<br>
#include "llvm/MC/MCExpr.h"<br>
+#include "llvm/MC/MCSectionMachO.h"<br>
#include "llvm/MC/MCStreamer.h"<br>
using namespace llvm;<br>
<br>
-void MCAsmInfoDarwin::anchor() { }<br>
+bool MCAsmInfoDarwin::isSectionAtomizableBySymbols(<br>
+ const MCSection &Section) const {<br>
+ const MCSectionMachO &SMO = static_cast<const MCSectionMachO &>(Section);<br>
+<br>
+ // Sections holding 1 byte strings are atomized based on the data they<br>
+ // contain.<br>
+ // Sections holding 2 byte strings require symbols in order to be atomized.<br>
+ // There is no dedicated section for 4 byte strings.<br>
+ if (SMO.getKind().isMergeable1ByteCString())<br>
+ return false;<br>
+<br>
+ if (SMO.getSegmentName() == "__TEXT" &&<br>
+ SMO.getSectionName() == "__objc_classname" &&<br>
+ SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
+ return false;<br>
+<br>
+ if (SMO.getSegmentName() == "__TEXT" &&<br>
+ SMO.getSectionName() == "__objc_methname" &&<br>
+ SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
+ return false;<br>
+<br>
+ if (SMO.getSegmentName() == "__TEXT" &&<br>
+ SMO.getSectionName() == "__objc_methtype" &&<br>
+ SMO.getType() == MachO::S_CSTRING_LITERALS)<br>
+ return false;<br>
+<br>
+ if (SMO.getSegmentName() == "__DATA" && SMO.getSectionName() == "__cfstring")<br>
+ return false;<br>
+<br>
+ // no_dead_strip sections are not atomized in practice.<br>
+ if (SMO.hasAttribute(MachO::S_ATTR_NO_DEAD_STRIP))<br>
+ return false;<br>
+<br>
+ switch (SMO.getType()) {<br>
+ default:<br>
+ return true;<br>
+<br>
+ // These sections are atomized at the element boundaries without using<br>
+ // symbols.<br>
+ case MachO::S_4BYTE_LITERALS:<br>
+ case MachO::S_8BYTE_LITERALS:<br>
+ case MachO::S_16BYTE_LITERALS:<br>
+ case MachO::S_LITERAL_POINTERS:<br>
+ case MachO::S_NON_LAZY_SYMBOL_POINTERS:<br>
+ case MachO::S_LAZY_SYMBOL_POINTERS:<br>
+ case MachO::S_MOD_INIT_FUNC_POINTERS:<br>
+ case MachO::S_MOD_TERM_FUNC_POINTERS:<br>
+ case MachO::S_INTERPOSING:<br>
+ return false;<br>
+ }<br>
+}<br>
<br>
MCAsmInfoDarwin::MCAsmInfoDarwin() {<br>
// Common settings for all Darwin targets.<br>
<br>
Modified: llvm/trunk/lib/MC/MCAssembler.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/MC/MCAssembler.cpp (original)<br>
+++ llvm/trunk/lib/MC/MCAssembler.cpp Mon Dec 29 09:18:31 2014<br>
@@ -12,6 +12,7 @@<br>
#include "llvm/ADT/StringExtras.h"<br>
#include "llvm/ADT/Twine.h"<br>
#include "llvm/MC/MCAsmBackend.h"<br>
+#include "llvm/MC/MCAsmInfo.h"<br>
#include "llvm/MC/MCAsmLayout.h"<br>
#include "llvm/MC/MCCodeEmitter.h"<br>
#include "llvm/MC/MCContext.h"<br>
@@ -448,8 +449,8 @@ const MCSymbolData *MCAssembler::getAtom<br>
<br>
// Non-linker visible symbols in sections which can't be atomized have no<br>
// defining atom.<br>
- if (!getBackend().isSectionAtomizable(<br>
- SD->getFragment()->getParent()->getSection()))<br>
+ if (!getContext().getAsmInfo()->isSectionAtomizableBySymbols(<br>
+ SD->getFragment()->getParent()->getSection()))<br>
return nullptr;<br>
<br>
// Otherwise, return the atom for the containing fragment.<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h (original)<br>
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h Mon Dec 29 09:18:31 2014<br>
@@ -21,7 +21,8 @@<br>
namespace llvm {<br>
<br>
class ARMMCAsmInfoDarwin : public MCAsmInfoDarwin {<br>
- void anchor() override;<br>
+ virtual void anchor();<br>
+<br>
public:<br>
explicit ARMMCAsmInfoDarwin(StringRef TT);<br>
};<br>
<br>
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h (original)<br>
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h Mon Dec 29 09:18:31 2014<br>
@@ -21,7 +21,8 @@ namespace llvm {<br>
class Triple;<br>
<br>
class PPCMCAsmInfoDarwin : public MCAsmInfoDarwin {<br>
- void anchor() override;<br>
+ virtual void anchor();<br>
+<br>
public:<br>
explicit PPCMCAsmInfoDarwin(bool is64Bit, const Triple&);<br>
};<br>
<br>
Modified: llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp Mon Dec 29 09:18:31 2014<br>
@@ -270,12 +270,6 @@ SectionForGlobal(const GlobalValue *GV,<br>
return SelectSectionForGlobal(GV, Kind, Mang, TM);<br>
}<br>
<br>
-bool TargetLoweringObjectFile::isSectionAtomizableBySymbols(<br>
- const MCSection &Section) const {<br>
- return false;<br>
-}<br>
-<br>
-<br>
/// getSectionForConstant - Given a mergable constant with the<br>
/// specified size and relocation information, return a section that it<br>
/// should be placed in.<br>
<br>
Modified: llvm/trunk/lib/Target/TargetMachine.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/TargetMachine.cpp (original)<br>
+++ llvm/trunk/lib/Target/TargetMachine.cpp Mon Dec 29 09:18:31 2014<br>
@@ -182,7 +182,8 @@ void TargetMachine::getNameWithPrefix(Sm<br>
const TargetLoweringObjectFile &TLOF =<br>
getSubtargetImpl()->getTargetLowering()->getObjFileLowering();<br>
const MCSection *TheSection = TLOF.SectionForGlobal(GV, GVKind, Mang, *this);<br>
- bool CannotUsePrivateLabel = TLOF.isSectionAtomizableBySymbols(*TheSection);<br>
+ bool CannotUsePrivateLabel =<br>
+ AsmInfo->isSectionAtomizableBySymbols(*TheSection);<br>
Mang.getNameWithPrefix(Name, GV, CannotUsePrivateLabel);<br>
}<br>
<br>
<br>
Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp (original)<br>
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp Mon Dec 29 09:18:31 2014<br>
@@ -790,26 +790,6 @@ public:<br>
return SMO.getType() == MachO::S_CSTRING_LITERALS;<br>
}<br>
<br>
- bool isSectionAtomizable(const MCSection &Section) const override {<br>
- const MCSectionMachO &SMO = static_cast<const MCSectionMachO&>(Section);<br>
- // Fixed sized data sections are uniqued, they cannot be diced into atoms.<br>
- switch (SMO.getType()) {<br>
- default:<br>
- return true;<br>
-<br>
- case MachO::S_4BYTE_LITERALS:<br>
- case MachO::S_8BYTE_LITERALS:<br>
- case MachO::S_16BYTE_LITERALS:<br>
- case MachO::S_LITERAL_POINTERS:<br>
- case MachO::S_NON_LAZY_SYMBOL_POINTERS:<br>
- case MachO::S_LAZY_SYMBOL_POINTERS:<br>
- case MachO::S_MOD_INIT_FUNC_POINTERS:<br>
- case MachO::S_MOD_TERM_FUNC_POINTERS:<br>
- case MachO::S_INTERPOSING:<br>
- return false;<br>
- }<br>
- }<br>
-<br>
/// \brief Generate the compact unwind encoding for the CFI instructions.<br>
uint32_t generateCompactUnwindEncoding(<br>
ArrayRef<MCCFIInstruction> Instrs) const override {<br>
<br>
Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h?rev=224935&r1=224934&r2=224935&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h (original)<br>
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h Mon Dec 29 09:18:31 2014<br>
@@ -23,7 +23,8 @@ namespace llvm {<br>
class Triple;<br>
<br>
class X86MCAsmInfoDarwin : public MCAsmInfoDarwin {<br>
- void anchor() override;<br>
+ virtual void anchor();<br>
+<br>
public:<br>
explicit X86MCAsmInfoDarwin(const Triple &Triple);<br>
};<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>