Skip to content

Commit 3c57a50

Browse files
author
Micha Reiser
authored
Drop LLVM < 9 support (#123)
1 parent 6933505 commit 3c57a50

File tree

7 files changed

+6
-47
lines changed

7 files changed

+6
-47
lines changed

llvm-node.d.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ declare namespace llvm {
105105
Acquire,
106106
Release,
107107
AcquireRelease,
108-
SequentiallyConsistent
108+
SequentiallyConsistent,
109109
}
110110

111111
class Value {
@@ -337,10 +337,6 @@ declare namespace llvm {
337337
SPIR_KERNEL,
338338
Intel_OCL_BI,
339339
X86_64_SysV,
340-
/**
341-
* @deprecated use Win64 instead
342-
*/
343-
X86_64_Win64,
344340
Win64,
345341
X86_VectorCall,
346342
HHVM,
@@ -698,7 +694,7 @@ declare namespace llvm {
698694
Max,
699695
Min,
700696
UMax,
701-
UMin
697+
UMin,
702698
}
703699
}
704700

src/bitcode/bitcode-writer.cc

-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ NAN_METHOD(WriteBitcodeToFile) {
2828
return Nan::ThrowError((messagePrefix + errorCode.message()).c_str());
2929
}
3030

31-
#if LLVM_VERSION_MAJOR > 6
3231
llvm::WriteBitcodeToFile(*module, byteCodeFile);
33-
#else
34-
llvm::WriteBitcodeToFile(module, byteCodeFile);
35-
#endif
3632

3733
byteCodeFile.flush();
3834
byteCodeFile.close();

src/ir/argument.cc

-9
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,7 @@ NAN_METHOD(ArgumentWrapper::New) {
6565
argNo = Nan::To<uint32_t>(info[3]).FromJust();
6666
}
6767

68-
#if LLVM_VERSION_MAJOR == 4
69-
auto* argument = new llvm::Argument { type, name, function };
70-
#else
7168
auto* argument = new llvm::Argument { type, name, function, argNo };
72-
#endif
7369
auto* wrapper = new ArgumentWrapper { argument };
7470
wrapper->Wrap(info.This());
7571

@@ -126,12 +122,7 @@ NAN_METHOD(ArgumentWrapper::addDereferenceableAttr) {
126122
llvm::AttrBuilder builder {};
127123
builder.addDereferenceableAttr(bytes);
128124

129-
#if LLVM_VERSION_MAJOR == 4
130-
auto attributes = llvm::AttributeSet::get(argument->getContext(), argument->getArgNo() + 1, builder);
131-
argument->addAttr(attributes);
132-
#else
133125
argument->addAttrs(builder);
134-
#endif
135126
}
136127

137128
llvm::Argument *ArgumentWrapper::getArgument() {

src/ir/call-inst.cc

-8
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ NAN_METHOD(CallInstWrapper::hasRetAttr) {
7878
auto kind = static_cast<llvm::Attribute::AttrKind >(Nan::To<uint32_t>(info[0]).FromJust());
7979
bool hasRetAttr = false;
8080

81-
#if LLVM_VERSION_MAJOR == 4
82-
hasRetAttr = call->paramHasAttr(llvm::AttributeSet::ReturnIndex, kind);
83-
#else
8481
hasRetAttr = call->hasRetAttr(kind);
85-
#endif
8682

8783
info.GetReturnValue().Set(hasRetAttr);
8884
}
@@ -98,11 +94,7 @@ NAN_METHOD(CallInstWrapper::paramHasAttr) {
9894
const auto kind = static_cast<llvm::Attribute::AttrKind >(Nan::To<uint32_t>(info[1]).FromJust());
9995
bool paramHasAttr = false;
10096

101-
#if LLVM_VERSION_MAJOR == 4
102-
paramHasAttr = call->paramHasAttr(index + 1, kind);
103-
#else
10497
paramHasAttr = call->paramHasAttr(index, kind);
105-
#endif
10698
info.GetReturnValue().Set(paramHasAttr);
10799
}
108100

src/ir/calling-conv.cc

-7
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@ NAN_MODULE_INIT(InitCallingConv) {
3434
Nan::Set(object, Nan::New("SPIR_KERNEL").ToLocalChecked(), Nan::New(llvm::CallingConv::SPIR_KERNEL));
3535
Nan::Set(object, Nan::New("Intel_OCL_BI").ToLocalChecked(), Nan::New(llvm::CallingConv::Intel_OCL_BI));
3636
Nan::Set(object, Nan::New("X86_64_SysV").ToLocalChecked(), Nan::New(llvm::CallingConv::X86_64_SysV));
37-
38-
#if LLVM_VERSION_MAJOR == 4
39-
Nan::Set(object, Nan::New("X86_64_Win64").ToLocalChecked(), Nan::New(llvm::CallingConv::X86_64_Win64));
40-
#else
41-
Nan::Set(object, Nan::New("X86_64_Win64").ToLocalChecked(), Nan::New(llvm::CallingConv::Win64));
4237
Nan::Set(object, Nan::New("Win64").ToLocalChecked(), Nan::New(llvm::CallingConv::Win64));
43-
#endif
44-
4538
Nan::Set(object, Nan::New("X86_VectorCall").ToLocalChecked(), Nan::New(llvm::CallingConv::X86_VectorCall));
4639
Nan::Set(object, Nan::New("HHVM").ToLocalChecked(), Nan::New(llvm::CallingConv::HHVM));
4740
Nan::Set(object, Nan::New("HHVM_C").ToLocalChecked(), Nan::New(llvm::CallingConv::HHVM_C));

src/ir/module.cc

+4-9
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,10 @@ NAN_METHOD(ModuleWrapper::getOrInsertFunction) {
9595

9696
auto functionCallee = Nan::New<v8::Object>();
9797

98-
#if LLVM_VERSION_MAJOR < 9
99-
Nan::Set(functionCallee, Nan::New("callee").ToLocalChecked(), ConstantWrapper::of(module->getOrInsertFunction(name, fnType)));
100-
Nan::Set(functionCallee, Nan::New("functionType").ToLocalChecked(), FunctionTypeWrapper::of(fnType));
101-
#else
102-
auto llvmCallee = module->getOrInsertFunction(name, fnType);
103-
Nan::Set(functionCallee, Nan::New("callee").ToLocalChecked(), ValueWrapper::of(llvmCallee.getCallee()));
104-
Nan::Set(functionCallee, Nan::New("functionType").ToLocalChecked(), FunctionTypeWrapper::of(llvmCallee.getFunctionType()));
105-
#endif
106-
98+
auto llvmCallee = module->getOrInsertFunction(name, fnType);
99+
Nan::Set(functionCallee, Nan::New("callee").ToLocalChecked(), ValueWrapper::of(llvmCallee.getCallee()));
100+
Nan::Set(functionCallee, Nan::New("functionType").ToLocalChecked(), FunctionTypeWrapper::of(llvmCallee.getFunctionType()));
101+
107102
Nan::EscapableHandleScope scope {};
108103
info.GetReturnValue().Set(scope.Escape(functionCallee));
109104
}

src/ir/value.cc

-4
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,7 @@ NAN_SETTER(ValueWrapper::setName)
114114
NAN_METHOD(ValueWrapper::deleteValue)
115115
{
116116
auto *wrapper = ValueWrapper::FromValue(info.Holder());
117-
#if LLVM_VERSION_MAJOR == 4
118-
delete wrapper->getValue();
119-
#else
120117
wrapper->getValue()->deleteValue();
121-
#endif
122118
}
123119

124120
NAN_METHOD(ValueWrapper::replaceAllUsesWith)

0 commit comments

Comments
 (0)