Skip to content

Commit b1ca5cf

Browse files
committed
[Misc] update llvm version to 13
1 parent c4413c3 commit b1ca5cf

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

include/soll/AST/Decl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ class Decl {
2929
friend class ASTReader;
3030

3131
protected:
32-
Decl(SourceRange L,
33-
llvm::StringRef Name = llvm::StringRef::withNullAsEmpty(nullptr),
32+
Decl(SourceRange L, llvm::StringRef Name = llvm::StringRef(""),
3433
Visibility vis = Visibility::Default)
3534
: Location(L), Name(Name.str()), Vis(vis), UniqueName(Name.str()) {}
3635

lib/CodeGen/BackendUtil.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ void EmitAssemblyHelper::EmitAssembly(
143143
TheModule->setDataLayout(TM->createDataLayout());
144144
}
145145

146-
#if LLVM_VERSION_MAJOR >= 12
146+
#if LLVM_VERSION_MAJOR >= 13
147+
llvm::PassBuilder PB(TM.get(), llvm::PipelineTuningOptions(), llvm::None);
148+
#elif LLVM_VERSION_MAJOR >= 12
147149
llvm::PassBuilder PB(false, TM.get(), llvm::PipelineTuningOptions(),
148150
llvm::None);
149151
#elif LLVM_VERSION_MAJOR >= 9
@@ -152,10 +154,17 @@ void EmitAssemblyHelper::EmitAssembly(
152154
llvm::PassBuilder PB(TM.get(), llvm::None);
153155
#endif
154156

157+
#if LLVM_VERSION_MAJOR >= 13
158+
llvm::LoopAnalysisManager LAM;
159+
llvm::FunctionAnalysisManager FAM;
160+
llvm::CGSCCAnalysisManager CGAM;
161+
llvm::ModuleAnalysisManager MAM;
162+
#else
155163
llvm::LoopAnalysisManager LAM(false);
156164
llvm::FunctionAnalysisManager FAM(false);
157165
llvm::CGSCCAnalysisManager CGAM(false);
158166
llvm::ModuleAnalysisManager MAM(false);
167+
#endif
159168

160169
// Register the AA manager first so that our version is the one used.
161170
FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); });
@@ -177,7 +186,11 @@ void EmitAssemblyHelper::EmitAssembly(
177186
PB.registerLoopAnalyses(LAM);
178187
PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
179188

189+
#if LLVM_VERSION_MAJOR >= 13
190+
llvm::ModulePassManager MPM;
191+
#else
180192
llvm::ModulePassManager MPM(false);
193+
#endif
181194

182195
if (TargetOpts.BackendTarget == EWASM) {
183196
MPM.addPass(LoweringInteger());

lib/Frontend/ASTConsumers/ASTPrinter.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
#include "soll/AST/AST.h"
33
#include "soll/AST/ASTConsumer.h"
44
#include "soll/Frontend/ASTConsumers.h"
5+
#if LLVM_VERSION_MAJOR >= 13
6+
#include <llvm/ADT/StringExtras.h>
7+
#endif
58
#include <llvm/ADT/Twine.h>
69
#include <llvm/Support/raw_ostream.h>
7-
810
namespace {
911

1012
std::string ToString(soll::UnaryOperatorKind op) {
@@ -136,7 +138,11 @@ std::string ToString(soll::TypePtr type) {
136138
return llvm::Twine(ToString(at->getElementType()) + "[" +
137139
(at->isDynamicSized()
138140
? ""
141+
#if LLVM_VERSION_MAJOR >= 13
142+
: toString(at->getLength(), 10, false)) +
143+
#else
139144
: at->getLength().toString(10, false)) +
145+
#endif
140146
"]")
141147
.str();
142148
}
@@ -495,7 +501,11 @@ void ASTPrinter::visit(NumberLiteralType &literal) {
495501
const bool Signed =
496502
dynamic_cast<IntegerType *>(literal.getType().get())->isSigned();
497503
os() << indent() << "NumberLiteral "
504+
#if LLVM_VERSION_MAJOR >= 13
505+
<< toString(literal.getValue(), 10, Signed) << "\n";
506+
#else
498507
<< literal.getValue().toString(10, Signed) << "\n";
508+
#endif
499509
ConstStmtVisitor::visit(literal);
500510
unindent();
501511
}

lib/Frontend/CompilerInstance.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,12 @@ std::unique_ptr<llvm::raw_pwrite_stream> CompilerInstance::createOutputFile(
278278
OSFile = OutFile;
279279
OS.reset(new llvm::raw_fd_ostream(
280280
OSFile, Error,
281-
(Binary ? llvm::sys::fs::F_None : llvm::sys::fs::F_Text)));
281+
#if LLVM_VERSION_MAJOR >= 13
282+
(Binary ? llvm::sys::fs::OF_None : llvm::sys::fs::OF_Text)
283+
#else
284+
(Binary ? llvm::sys::fs::F_None : llvm::sys::fs::F_Text)
285+
#endif
286+
));
282287
if (Error)
283288
return nullptr;
284289
}

0 commit comments

Comments
 (0)