summaryrefslogtreecommitdiff
path: root/tools/versioner/src/DeclarationDatabase.cpp
diff options
context:
space:
mode:
authorLogan Chien <loganchien@google.com>2019-12-20 10:27:45 -0800
committerLogan Chien <loganchien@google.com>2019-12-23 07:22:48 -0800
commitc88331b062803cf2a5257e41b9e38c6a2ea25122 (patch)
treeb46535897888d14c00dea3a16672987feec52064 /tools/versioner/src/DeclarationDatabase.cpp
parenta6bf7f2ee355559ec95378c7290702290aafb73c (diff)
versioner: Add versioner_fortify_inline annotation
This commit adds versioner_fortify_inline annotation. This annotation indicates that the annotated function is an overloaded inline function for _FORTIFY_SOURCE implementation. They are usually enabled/disabled by the enable_if attribute, thus the versioner don't have to check whether they have conflicting definitions. Bug: 118991081 Test: source development/vndk/tools/header-checker/android/envsetup.sh && \ source build/envsetup.sh && \ lunch aosp_arm64-userdebug && \ m versioner && \ ./bionic/tools/versioner/run_tests.py Change-Id: If5c739fc0c8a218907855939c1fe5338134da7f7
Diffstat (limited to 'tools/versioner/src/DeclarationDatabase.cpp')
-rw-r--r--tools/versioner/src/DeclarationDatabase.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/versioner/src/DeclarationDatabase.cpp b/tools/versioner/src/DeclarationDatabase.cpp
index 0ba51d1b8..afae509ae 100644
--- a/tools/versioner/src/DeclarationDatabase.cpp
+++ b/tools/versioner/src/DeclarationDatabase.cpp
@@ -106,6 +106,7 @@ class Visitor : public RecursiveASTVisitor<Visitor> {
bool is_extern = named_decl->getFormalLinkage() == ExternalLinkage;
bool is_definition = false;
bool no_guard = false;
+ bool fortify_inline = false;
if (auto function_decl = dyn_cast<FunctionDecl>(decl)) {
is_definition = function_decl->isThisDeclarationADefinition();
@@ -147,6 +148,8 @@ class Visitor : public RecursiveASTVisitor<Visitor> {
llvm::StringRef annotation = attr->getAnnotation();
if (annotation == "versioner_no_guard") {
no_guard = true;
+ } else if (annotation == "versioner_fortify_inline") {
+ fortify_inline = true;
} else {
llvm::SmallVector<llvm::StringRef, 2> fragments;
annotation.split(fragments, "=");
@@ -217,7 +220,8 @@ class Visitor : public RecursiveASTVisitor<Visitor> {
declaration_it != symbol_it->second.declarations.end()) {
if (declaration_it->second.is_extern != is_extern ||
declaration_it->second.is_definition != is_definition ||
- declaration_it->second.no_guard != no_guard) {
+ declaration_it->second.no_guard != no_guard ||
+ declaration_it->second.fortify_inline != fortify_inline) {
errx(1, "varying declaration of '%s' at %s:%u:%u", declaration_name.c_str(),
location.filename.c_str(), location.start.line, location.start.column);
}
@@ -229,6 +233,7 @@ class Visitor : public RecursiveASTVisitor<Visitor> {
declaration.is_extern = is_extern;
declaration.is_definition = is_definition;
declaration.no_guard = no_guard;
+ declaration.fortify_inline = fortify_inline;
declaration.availability.insert(std::make_pair(type, availability));
symbol_it->second.declarations.insert(std::make_pair(location, declaration));
}