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

MC: Fix associative sections on COFF 

COFF sections in MC were represented by a tuple of section-name and
COMDAT-name.  This is not sufficient to represent a .text section
associated with another .text section; we need a way to distinguish
between the key section and the one marked associative.

llvm-svn: 211913
This commit is contained in:
David Majnemer 2014-06-27 17:19:44 +00:00
parent 05d761cf24
commit c57d038240
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/MC/MCContext.h
View File

@ -22,6 +22,7 @@
#include "llvm/Support/Compiler.h"
#include "llvm/Support/raw_ostream.h"
#include <map>
#include <tuple>
#include <vector> // FIXME: Shouldn't be needed.
namespace llvm {
@ -160,10 +161,11 @@ namespace llvm {
unsigned DwarfCompileUnitID;
typedef std::pair<std::string, std::string> SectionGroupPair;
typedef std::tuple<std::string, std::string, int> SectionGroupTriple;
StringMap<const MCSectionMachO*> MachOUniquingMap;
std::map<SectionGroupPair, const MCSectionELF *> ELFUniquingMap;
std::map<SectionGroupPair, const MCSectionCOFF *> COFFUniquingMap;
std::map<SectionGroupTriple, const MCSectionCOFF *> COFFUniquingMap;
/// Do automatic reset in destructor
bool AutoReset;

10
llvm/lib/MC/MCContext.cpp
View File

@ -284,8 +284,8 @@ const MCSectionCOFF *MCContext::getCOFFSection(StringRef Section,
int Selection) {
// Do the lookup, if we have a hit, return it.
SectionGroupPair P(Section, COMDATSymName);
auto IterBool = COFFUniquingMap.insert(std::make_pair(P, nullptr));
SectionGroupTriple T(Section, COMDATSymName, Selection);
auto IterBool = COFFUniquingMap.insert(std::make_pair(T, nullptr));
auto Iter = IterBool.first;
if (!IterBool.second)
return Iter->second;
@ -294,7 +294,7 @@ const MCSectionCOFF *MCContext::getCOFFSection(StringRef Section,
if (!COMDATSymName.empty())
COMDATSymbol = GetOrCreateSymbol(COMDATSymName);
StringRef CachedName = Iter->first.first;
StringRef CachedName = std::get<0>(Iter->first);
MCSectionCOFF *Result = new (*this)
MCSectionCOFF(CachedName, Characteristics, COMDATSymbol, Selection, Kind);
@ -309,8 +309,8 @@ MCContext::getCOFFSection(StringRef Section, unsigned Characteristics,
}
const MCSectionCOFF *MCContext::getCOFFSection(StringRef Section) {
SectionGroupPair P(Section, "");
auto Iter = COFFUniquingMap.find(P);
SectionGroupTriple T(Section, "", 0);
auto Iter = COFFUniquingMap.find(T);
if (Iter == COFFUniquingMap.end())
return nullptr;
return Iter->second;

6
llvm/lib/MC/MCParser/COFFAsmParser.cpp
View File

@ -292,8 +292,7 @@ bool COFFAsmParser::ParseDirectiveSymbolAttribute(StringRef Directive, SMLoc) {
bool COFFAsmParser::ParseSectionSwitch(StringRef Section,
unsigned Characteristics,
SectionKind Kind) {
return ParseSectionSwitch(Section, Characteristics, Kind, "",
COFF::IMAGE_COMDAT_SELECT_ANY);
return ParseSectionSwitch(Section, Characteristics, Kind, "", (COFF::COMDATType)0);
}
bool COFFAsmParser::ParseSectionSwitch(StringRef Section,
@ -357,9 +356,10 @@ bool COFFAsmParser::ParseDirectiveSection(StringRef, SMLoc) {
return true;
}
COFF::COMDATType Type = COFF::IMAGE_COMDAT_SELECT_ANY;
COFF::COMDATType Type = (COFF::COMDATType)0;
StringRef COMDATSymName;
if (getLexer().is(AsmToken::Comma)) {
Type = COFF::IMAGE_COMDAT_SELECT_ANY;;
Lex();
Flags |= COFF::IMAGE_SCN_LNK_COMDAT;

17
llvm/test/MC/COFF/section-comdat.s
View File

@ -39,6 +39,11 @@ Symbol6:
Symbol7:
.long 1
.section assocSec, "dr", associative, "assocSym"
.globl Symbol8
Symbol8:
.long 1
// CHECK: Sections [
// CHECK: Section {
// CHECK: Number: 4
@ -185,7 +190,19 @@ Symbol7:
// CHECK: Section: SecName (11)
// CHECK: }
// CHECK: Symbol {
// CHECK: Name: assocSec
// CHECK: Section: assocSec (12)
// CHECK: AuxSectionDef {
// CHECK: Selection: Associative (0x5)
// CHECK: AssocSection: assocSec (4)
// CHECK: }
// CHECK: }
// CHECK: Symbol {
// CHECK: Name: Symbol5
// CHECK: Section: SecName (9)
// CHECK: }
// CHECK: Symbol {
// CHECK: Name: Symbol8
// CHECK: Section: assocSec (12)
// CHECK: }
// CHECK: ]