Skip to content

Commit 92d9ade

Browse files
kinkekinke
committed
Rework LLVM attributes abstraction.
1 parent c3f2e19 commit 92d9ade

File tree

3 files changed

+97
-113
lines changed

3 files changed

+97
-113
lines changed

‎gen/attributes.cpp

+72-30
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
#include "gen/attributes.h"
1111
#include "gen/irstate.h"
1212

13-
bool AttrBuilder::hasAttributes() const {
13+
bool AttrBuilder::hasAttributes() const
14+
{
1415
#if LDC_LLVM_VER >= 302
1516
return attrs.hasAttributes();
1617
#else
1718
return attrs.Raw() != 0;
1819
#endif
1920
}
2021

21-
bool AttrBuilder::contains(A attribute) const {
22+
bool AttrBuilder::contains(A attribute) const
23+
{
2224
#if LDC_LLVM_VER >= 303
2325
return attrs.contains(attribute);
2426
#elif LDC_LLVM_VER == 302
@@ -28,7 +30,8 @@ bool AttrBuilder::contains(A attribute) const {
2830
#endif
2931
}
3032

31-
AttrBuilder& AttrBuilder::clear() {
33+
AttrBuilder& AttrBuilder::clear()
34+
{
3235
#if LDC_LLVM_VER >= 302
3336
attrs.clear();
3437
#else
@@ -37,7 +40,8 @@ AttrBuilder& AttrBuilder::clear() {
3740
return *this;
3841
}
3942

40-
AttrBuilder& AttrBuilder::add(A attribute) {
43+
AttrBuilder& AttrBuilder::add(A attribute)
44+
{
4145
#if LDC_LLVM_VER >= 302
4246
// never set 'None' explicitly
4347
if (attribute)
@@ -48,7 +52,8 @@ AttrBuilder& AttrBuilder::add(A attribute) {
4852
return *this;
4953
}
5054

51-
AttrBuilder& AttrBuilder::remove(A attribute) {
55+
AttrBuilder& AttrBuilder::remove(A attribute)
56+
{
5257
#if LDC_LLVM_VER >= 302
5358
// never remove 'None' explicitly
5459
if (attribute)
@@ -59,62 +64,99 @@ AttrBuilder& AttrBuilder::remove(A attribute) {
5964
return *this;
6065
}
6166

62-
63-
AttrSet& AttrSet::add(unsigned index, AttrBuilder builder) {
64-
if (builder.hasAttributes())
65-
entries[index] = builder;
67+
AttrBuilder& AttrBuilder::merge(const AttrBuilder& other)
68+
{
69+
#if LDC_LLVM_VER >= 303
70+
attrs.merge(other.attrs);
71+
#elif LDC_LLVM_VER == 302
72+
AttrBuilder mutableCopy = other;
73+
attrs.addAttributes(llvm::Attributes::get(gIR->context(), mutableCopy.attrs));
74+
#else
75+
attrs |= other.attrs;
76+
#endif
6677
return *this;
6778
}
6879

80+
81+
AttrSet AttrSet::extractFunctionAndReturnAttributes(const llvm::Function* function)
82+
{
83+
AttrSet set;
84+
6985
#if LDC_LLVM_VER >= 303
86+
NativeSet old = function->getAttributes();
87+
llvm::AttributeSet existingAttrs[] = { old.getFnAttributes(), old.getRetAttributes() };
88+
set.entries = llvm::AttributeSet::get(gIR->context(), existingAttrs);
89+
#else
90+
unsigned fnIndex = ~0u;
91+
unsigned retIndex = 0;
7092

71-
llvm::AttributeSet AttrSet::toNativeSet() const {
72-
llvm::AttributeSet set;
93+
#if LDC_LLVM_VER == 302
94+
#define ADD_ATTRIBS(i, a) \
95+
if (a.Raw()) \
96+
set.entries[i].attrs.addAttributes(a);
97+
#else
98+
#define ADD_ATTRIBS(i, a) \
99+
if (a.Raw()) \
100+
set.entries[i].attrs = a;
101+
#endif
73102

74-
typedef std::map<unsigned, AttrBuilder>::const_iterator I;
75-
for (I it = entries.begin(); it != entries.end(); ++it) {
76-
unsigned index = it->first;
77-
AttrBuilder builder = it->second;
78-
if (!builder.hasAttributes())
79-
continue;
103+
ADD_ATTRIBS(fnIndex, function->getAttributes().getFnAttributes());
104+
ADD_ATTRIBS(retIndex, function->getAttributes().getRetAttributes());
80105

81-
llvm::AttributeSet as = llvm::AttributeSet::get(gIR->context(),
82-
index, builder.attrs);
83-
set = set.addAttributes(gIR->context(), index, as);
84-
}
106+
#undef ADD_ATTRIBS
107+
#endif
85108

86109
return set;
87110
}
88111

112+
AttrSet& AttrSet::add(unsigned index, const AttrBuilder& builder)
113+
{
114+
if (builder.hasAttributes())
115+
{
116+
#if LDC_LLVM_VER >= 303
117+
AttrBuilder mutableBuilderCopy = builder;
118+
llvm::AttributeSet as = llvm::AttributeSet::get(
119+
gIR->context(), index, mutableBuilderCopy.attrs);
120+
entries = entries.addAttributes(gIR->context(), index, as);
89121
#else
122+
entries[index].merge(builder);
123+
#endif
124+
}
125+
return *this;
126+
}
90127

91-
llvm::AttrListPtr AttrSet::toNativeSet() const {
128+
AttrSet::NativeSet AttrSet::toNativeSet() const
129+
{
130+
#if LDC_LLVM_VER >= 303
131+
return entries;
132+
#else
92133
if (entries.empty())
93-
return llvm::AttrListPtr();
134+
return NativeSet();
94135

95136
std::vector<llvm::AttributeWithIndex> attrsWithIndex;
96137
attrsWithIndex.reserve(entries.size());
97138

98139
typedef std::map<unsigned, AttrBuilder>::const_iterator I;
99-
for (I it = entries.begin(); it != entries.end(); ++it) {
140+
for (I it = entries.begin(); it != entries.end(); ++it)
141+
{
100142
unsigned index = it->first;
101-
AttrBuilder builder = it->second;
143+
const AttrBuilder& builder = it->second;
102144
if (!builder.hasAttributes())
103145
continue;
104146

105147
#if LDC_LLVM_VER == 302
148+
AttrBuilder mutableBuilderCopy = builder;
106149
attrsWithIndex.push_back(llvm::AttributeWithIndex::get(index,
107-
llvm::Attributes::get(gIR->context(), builder.attrs)));
150+
llvm::Attributes::get(gIR->context(), mutableBuilderCopy.attrs)));
108151
#else
109152
attrsWithIndex.push_back(llvm::AttributeWithIndex::get(index, builder.attrs));
110153
#endif
111154
}
112155

113156
#if LDC_LLVM_VER == 302
114-
return llvm::AttrListPtr::get(gIR->context(), llvm::ArrayRef<llvm::AttributeWithIndex>(attrsWithIndex));
157+
return NativeSet::get(gIR->context(), attrsWithIndex);
115158
#else
116-
return llvm::AttrListPtr::get(attrsWithIndex.begin(), attrsWithIndex.end());
159+
return NativeSet::get(attrsWithIndex.begin(), attrsWithIndex.end());
117160
#endif
118-
}
119-
120161
#endif
162+
}

‎gen/attributes.h

+20-12
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,48 @@
1717
struct AttrBuilder
1818
{
1919
// A: basic attribute type
20+
// B: builder type
2021
#if LDC_LLVM_VER >= 303
2122
typedef llvm::Attribute::AttrKind A;
23+
typedef llvm::AttrBuilder B;
2224
#elif LDC_LLVM_VER == 302
2325
typedef llvm::Attributes::AttrVal A;
26+
typedef llvm::AttrBuilder B;
2427
#else
2528
typedef llvm::Attributes A;
29+
typedef llvm::Attributes B;
2630
#endif
2731

28-
// field for actual builder
29-
#if LDC_LLVM_VER >= 302
30-
llvm::AttrBuilder attrs;
31-
#else
32-
llvm::Attributes attrs;
33-
#endif
32+
B attrs;
33+
34+
AttrBuilder() {}
35+
AttrBuilder(const B& attrs) : attrs(attrs) {}
3436

3537
bool hasAttributes() const;
3638
bool contains(A attribute) const;
3739

3840
AttrBuilder& clear();
3941
AttrBuilder& add(A attribute);
4042
AttrBuilder& remove(A attribute);
43+
AttrBuilder& merge(const AttrBuilder& other);
4144
};
4245

4346
struct AttrSet
4447
{
45-
std::map<unsigned, AttrBuilder> entries;
46-
47-
AttrSet& add(unsigned index, AttrBuilder builder);
48-
4948
#if LDC_LLVM_VER >= 303
50-
llvm::AttributeSet toNativeSet() const;
49+
typedef llvm::AttributeSet NativeSet;
50+
NativeSet entries;
5151
#else
52-
llvm::AttrListPtr toNativeSet() const;
52+
typedef llvm::AttrListPtr NativeSet;
53+
std::map<unsigned, AttrBuilder> entries;
5354
#endif
55+
56+
AttrSet() {}
57+
static AttrSet extractFunctionAndReturnAttributes(const llvm::Function* function);
58+
59+
AttrSet& add(unsigned index, const AttrBuilder& builder);
60+
61+
NativeSet toNativeSet() const;
5462
};
5563

5664
// LDC_ATTRIBUTE(name) helper macro returning:

‎gen/functions.cpp

+5-71
Original file line numberDiff line numberDiff line change
@@ -504,23 +504,17 @@ void DtoResolveFunction(FuncDeclaration* fdecl)
504504

505505
//////////////////////////////////////////////////////////////////////////////////////////
506506

507-
#if LDC_LLVM_VER >= 303
508507
static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclaration* fdecl)
509508
{
510509
IrFuncTy &irFty = getIrFunc(fdecl)->irFty;
511-
llvm::AttributeSet old = func->getAttributes();
512-
llvm::AttributeSet existingAttrs[] = { old.getFnAttributes(), old.getRetAttributes() };
513-
llvm::AttributeSet newAttrs = llvm::AttributeSet::get(gIR->context(), existingAttrs);
510+
AttrSet newAttrs = AttrSet::extractFunctionAndReturnAttributes(func);
514511

515512
int idx = 0;
516513

517514
// handle implicit args
518515
#define ADD_PA(X) \
519516
if (irFty.X) { \
520-
if (irFty.X->attrs.hasAttributes()) { \
521-
llvm::AttributeSet as = llvm::AttributeSet::get(gIR->context(), idx, irFty.X->attrs.attrs); \
522-
newAttrs = newAttrs.addAttributes(gIR->context(), idx, as); \
523-
} \
517+
newAttrs.add(idx, irFty.X->attrs); \
524518
idx++; \
525519
}
526520

@@ -538,73 +532,13 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
538532
{
539533
assert(Parameter::getNth(f->parameters, k));
540534

541-
AttrBuilder builder = irFty.args[k]->attrs;
542-
if (builder.hasAttributes())
543-
{
544-
unsigned i = idx + (irFty.reverseParams ? n-k-1 : k);
545-
llvm::AttributeSet as = llvm::AttributeSet::get(gIR->context(), i, builder.attrs);
546-
newAttrs = newAttrs.addAttributes(gIR->context(), i, as);
547-
}
535+
unsigned i = idx + (irFty.reverseParams ? n-k-1 : k);
536+
newAttrs.add(i, irFty.args[k]->attrs);
548537
}
549538

550539
// Store the final attribute set
551-
func->setAttributes(newAttrs);
540+
func->setAttributes(newAttrs.toNativeSet());
552541
}
553-
#else
554-
static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclaration* fdecl)
555-
{
556-
IrFuncTy &irFty = getIrFunc(fdecl)->irFty;
557-
AttrSet set;
558-
559-
int idx = 0;
560-
561-
// handle implicit args
562-
#define ADD_PA(X) \
563-
if (irFty.X) { \
564-
if (irFty.X->attrs.hasAttributes()) \
565-
set.add(idx, irFty.X->attrs); \
566-
idx++; \
567-
}
568-
569-
ADD_PA(ret)
570-
ADD_PA(arg_sret)
571-
ADD_PA(arg_this)
572-
ADD_PA(arg_nest)
573-
ADD_PA(arg_arguments)
574-
575-
#undef ADD_PA
576-
577-
// set attrs on the rest of the arguments
578-
size_t n = Parameter::dim(f->parameters);
579-
for (size_t k = 0; k < n; k++)
580-
{
581-
assert(Parameter::getNth(f->parameters, k));
582-
583-
AttrBuilder builder = irFty.args[k]->attrs;
584-
if (builder.hasAttributes())
585-
{
586-
unsigned i = idx + (irFty.reverseParams ? n-k-1 : k);
587-
set.add(i, builder);
588-
}
589-
}
590-
591-
// Merge in any old attributes (attributes for the function itself are
592-
// also stored in a list slot).
593-
llvm::AttrListPtr oldAttrs = func->getAttributes();
594-
for (unsigned i = 0; i < oldAttrs.getNumSlots(); ++i)
595-
{
596-
const llvm::AttributeWithIndex& curr = oldAttrs.getSlot(i);
597-
AttrBuilder& builder = set.entries[curr.Index];
598-
#if LDC_LLVM_VER == 302
599-
builder.attrs.addAttributes(curr.Attrs);
600-
#else
601-
builder.attrs |= curr.Attrs;
602-
#endif
603-
}
604-
605-
func->setAttributes(set.toNativeSet());
606-
}
607-
#endif
608542

609543
//////////////////////////////////////////////////////////////////////////////////////////
610544

0 commit comments

Comments
 (0)