mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang API function terminology got changed

Browse Source 
...at least in trunk 200400 towards Clang 3.5.

Change-Id: I6e295e3a4cf721fbda9df8e7c5bed3993ee78216
This commit is contained in:
Stephan Bergmann
2014-01-31 09:37:27 +01:00
parent 29b322ea0c
commit b21e3d16aa
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
compilerplugins/clang/compat.hxx Normal file
View File

@@ -0,0 +1,49 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_COMPILERPLUGINS_CLANG_COMPAT_HXX
#define INCLUDED_COMPILERPLUGINS_CLANG_COMPAT_HXX
#include "clang/AST/Decl.h"
#include "clang/AST/Type.h"
// Compatibility wrapper to abstract over (trivial) chanes in the Clang API:
namespace compat {
inline clang::QualType getReturnType(clang::FunctionDecl const & decl) {
#if (__clang_major__ == 3 && __clang_minor__ >= 5) || __clang_major__ > 3
return decl.getReturnType();
#else
return decl.getResultType();
#endif
}
inline unsigned getNumParams(clang::FunctionProtoType const & type) {
#if (__clang_major__ == 3 && __clang_minor__ >= 5) || __clang_major__ > 3
return type.getNumParams();
#else
return type.getNumArgs();
#endif
}
inline clang::QualType getParamType(
clang::FunctionProtoType const & type, unsigned i)
{
#if (__clang_major__ == 3 && __clang_minor__ >= 5) || __clang_major__ > 3
return type.getParamType(i);
#else
return type.getArgType(i);
#endif
}
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

15
compilerplugins/clang/implicitboolconversion.cxx
View File

@@ -15,6 +15,7 @@
#include <string>
#include <vector>
#include "compat.hxx"
#include "plugin.hxx"
template<> struct std::iterator_traits<ExprIterator> {
@@ -183,11 +184,11 @@ bool ImplicitBoolConversion::TraverseCallExpr(CallExpr * expr) {
} else {
std::ptrdiff_t n = j - expr->arg_begin();
assert(n >= 0);
assert(n < t->getNumArgs() || t->isVariadic());
if (n < t->getNumArgs()
&& !(t->getArgType(n)->isSpecificBuiltinType(
assert(n < compat::getNumParams(*t) || t->isVariadic());
if (n < compat::getNumParams(*t)
&& !(compat::getParamType(*t, n)->isSpecificBuiltinType(
BuiltinType::Int)
|| (t->getArgType(n)->isSpecificBuiltinType(
|| (compat::getParamType(*t, n)->isSpecificBuiltinType(
BuiltinType::UInt))))
{
reportWarning(i);
@@ -494,8 +495,10 @@ bool ImplicitBoolConversion::TraverseReturnStmt(ReturnStmt * stmt) {
bool ImplicitBoolConversion::TraverseFunctionDecl(FunctionDecl * decl) {
bool ext = hasCLanguageLinkageType(decl)
&& decl->isThisDeclarationADefinition()
&& (decl->getResultType()->isSpecificBuiltinType(BuiltinType::Int)
|| decl->getResultType()->isSpecificBuiltinType(BuiltinType::UInt));
&& (compat::getReturnType(*decl)->isSpecificBuiltinType(
BuiltinType::Int)
|| compat::getReturnType(*decl)->isSpecificBuiltinType(
BuiltinType::UInt));
if (ext) {
assert(!externCIntFunctionDefinition);
externCIntFunctionDefinition = true;