summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-05-17 05:29:16 +0200
committerJan Tojnar <jtojnar@gmail.com>2022-05-17 05:36:17 +0200
commit44ea0ce07dca22118ea5e7bebf500377910cde19 (patch)
tree1b2cf872bc6c9d03f9fbfc21bea6513e0a24bb77
parent2d2315a4884e22b0d7bd04a1eabee06b07faa319 (diff)
Update for LLVM 13
- Size was renamed to Extent https://github.com/llvm/llvm-project/commit/9b3df78b4c2ab7a7063e532165492e1ffa38d401 ../clang-plugin/gerror-checker.cpp:81:10: fatal error: clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h: No such file or directory 81 | #include <clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - RValues are called PRValues as per C++11 taxonomy https://github.com/llvm/llvm-project/commit/aef5d8fdc7d0d348125d5ecf4a13be5888eb1654 ../clang-plugin/assertion-extracter.cpp:72:39: error: 'VK_RValue' was not declared in this scope 72 | VK_RValue, OK_Ordinary, SourceLocation (), | ^~~~~~~~~
-rw-r--r--clang-plugin/assertion-extracter.cpp8
-rw-r--r--clang-plugin/gerror-checker.cpp4
-rw-r--r--meson.build2
3 files changed, 7 insertions, 7 deletions
diff --git a/clang-plugin/assertion-extracter.cpp b/clang-plugin/assertion-extracter.cpp
index 231d03f..1e1a77d 100644
--- a/clang-plugin/assertion-extracter.cpp
+++ b/clang-plugin/assertion-extracter.cpp
@@ -69,7 +69,7 @@ _negation_expr (Expr* e, const ASTContext& context)
{
return UnaryOperator::Create (context, e, UnaryOperatorKind::UO_LNot,
context.getLogicalOperationType (),
- VK_RValue, OK_Ordinary, SourceLocation (),
+ VK_PRValue, OK_Ordinary, SourceLocation (),
/* can_overflow = */ false,
FPOptionsOverride());
}
@@ -80,7 +80,7 @@ _conjunction_expr (Expr* lhs, Expr* rhs, const ASTContext& context)
{
return BinaryOperator::Create (context, lhs, rhs, BinaryOperatorKind::BO_LAnd,
context.getLogicalOperationType (),
- VK_RValue, OK_Ordinary, SourceLocation (),
+ VK_PRValue, OK_Ordinary, SourceLocation (),
FPOptionsOverride ());
}
@@ -90,7 +90,7 @@ _disjunction_expr (Expr* lhs, Expr* rhs, const ASTContext& context)
{
return BinaryOperator::Create (context, lhs, rhs, BinaryOperatorKind::BO_LOr,
context.getLogicalOperationType (),
- VK_RValue, OK_Ordinary, SourceLocation (),
+ VK_PRValue, OK_Ordinary, SourceLocation (),
FPOptionsOverride ());
}
@@ -578,7 +578,7 @@ _simplify_boolean_expr (Expr* expr, const ASTContext& context)
return BinaryOperator::Create (context, lhs, rhs, opcode,
context.getLogicalOperationType (),
- VK_RValue, OK_Ordinary, SourceLocation (),
+ VK_PRValue, OK_Ordinary, SourceLocation (),
FPOptionsOverride ());
}
diff --git a/clang-plugin/gerror-checker.cpp b/clang-plugin/gerror-checker.cpp
index 493598e..46960b5 100644
--- a/clang-plugin/gerror-checker.cpp
+++ b/clang-plugin/gerror-checker.cpp
@@ -78,7 +78,7 @@
#include <clang/StaticAnalyzer/Core/Checker.h>
#include <clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h>
#include <clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h>
-#include <clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h>
+#include <clang/StaticAnalyzer/Core/PathSensitive/DynamicExtent.h>
#include "gerror-checker.h"
#include "type-manager.h"
@@ -705,7 +705,7 @@ GErrorChecker::_gerror_new (const Expr *call_expr,
assert (this->_initialise_identifiers (ast_context));
DefinedOrUnknownSVal extent =
- getDynamicSize (state, symbolic_allocated_region, sval_builder);
+ getDynamicExtent (state, symbolic_allocated_region, sval_builder);
const uint64_t _gerror_size =
ast_context.getTypeSize (this->_gerror_type);
DefinedOrUnknownSVal gerror_size =
diff --git a/meson.build b/meson.build
index 3465b27..aa19d1d 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ cxx = meson.get_compiler('cpp')
### Check for required libraries ###############################################
-llvm_requirement = '>= 12.0'
+llvm_requirement = '>= 13.0'
glib_requirement = '>= 2.38'
gir_requirement = '>= 1.38.0'