Skip to content

Commit 0ff9e14

Browse files
ddobrevtritao
authored andcommitted
Update LLVM to the latest version
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent c805fcf commit 0ff9e14

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

build/LLVM.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ function SetupLLVMLibs()
195195
"LLVMDebugInfoMSF",
196196
"LLVMBinaryFormat",
197197
"LLVMSupport",
198-
"LLVMDemangle",
199-
"LLVMHelloNew"
198+
"LLVMDemangle"
200199
}
201200

202201
filter(c)

build/llvm/LLVM-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0c8f9b8099fd0500cd885bc699924e20371014ff
1+
c40cea6f083a8a67ea950e058e16d37bb04e8c4b

src/CppParser/ParseExpr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
20742074
_S->hasPlaceholderType = S->hasPlaceholderType();
20752075
_S->typeAsWritten = GetQualifiedType(S->getTypeAsWritten());
20762076
_S->isListInitialization = S->isListInitialization();
2077-
_S->arg_size = S->arg_size();
2077+
_S->arg_size = S->getNumArgs();
20782078
for (auto _E : S->arguments())
20792079
{
20802080
auto _ES = WalkExpression(_E);

src/CppParser/Parser.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static CppAbi GetClassLayoutAbi(clang::TargetCXXABI::Kind abi)
9999
return CppAbi::ARM;
100100
case clang::TargetCXXABI::iOS:
101101
return CppAbi::iOS;
102-
case clang::TargetCXXABI::iOS64:
102+
case clang::TargetCXXABI::AppleARM64:
103103
return CppAbi::iOS64;
104104
default:
105105
llvm_unreachable("Unsupported C++ ABI kind");
@@ -229,7 +229,7 @@ ConvertToClangTargetCXXABI(CppSharp::CppParser::AST::CppAbi abi)
229229
case CppSharp::CppParser::AST::CppAbi::iOS:
230230
return TargetCXXABI::iOS;
231231
case CppSharp::CppParser::AST::CppAbi::iOS64:
232-
return TargetCXXABI::iOS64;
232+
return TargetCXXABI::AppleARM64;
233233
}
234234

235235
llvm_unreachable("Unsupported C++ ABI.");
@@ -3707,7 +3707,7 @@ AST::ExpressionObsolete* Parser::WalkVariableInitializerExpression(const clang::
37073707
return WalkExpressionObsolete(Expr);
37083708

37093709
clang::Expr::EvalResult result;
3710-
if (Expr->EvaluateAsConstantExpr(result, clang::Expr::ConstExprUsage::EvaluateForCodeGen, c->getASTContext(), false))
3710+
if (Expr->EvaluateAsConstantExpr(result, c->getASTContext()))
37113711
{
37123712
std::string s;
37133713
llvm::raw_string_ostream out(s);
@@ -4420,9 +4420,9 @@ static ArchType ConvertArchType(unsigned int archType)
44204420
}
44214421

44224422
template<class ELFT>
4423-
static void ReadELFDependencies(const llvm::object::ELFFile<ELFT>* ELFFile, CppSharp::CppParser::NativeLibrary*& NativeLib)
4423+
static void ReadELFDependencies(const llvm::object::ELFFile<ELFT>& ELFFile, CppSharp::CppParser::NativeLibrary*& NativeLib)
44244424
{
4425-
ELFDumper<ELFT> ELFDumper(ELFFile);
4425+
ELFDumper<ELFT> ELFDumper(&ELFFile);
44264426
for (const auto& Dependency : ELFDumper.getNeededLibraries())
44274427
NativeLib->Dependencies.push_back(Dependency.str());
44284428
}

0 commit comments

Comments
 (0)