summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 03:35:59 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 03:35:59 +0000
commitaa72e8deb478f1815feac4037383651688bd19f7 (patch)
tree477aa617cc61e2c35d4e9ad42bcf5df0c338566f /tools/clang
parent7c9ace59dbef4137ab057cb4fa507d982cd62444 (diff)
downloadchromium_src-aa72e8deb478f1815feac4037383651688bd19f7.zip
chromium_src-aa72e8deb478f1815feac4037383651688bd19f7.tar.gz
chromium_src-aa72e8deb478f1815feac4037383651688bd19f7.tar.bz2
roll clang 163674:165787
Also includes r165962 and r165963 on mac to fix a build issue. BUG=156005,151927 Review URL: https://codereview.chromium.org/11143020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
-rw-r--r--tools/clang/plugins/FindBadConstructs.cpp4
-rwxr-xr-xtools/clang/scripts/plugin_flags.sh4
-rwxr-xr-xtools/clang/scripts/update.sh2
3 files changed, 4 insertions, 6 deletions
diff --git a/tools/clang/plugins/FindBadConstructs.cpp b/tools/clang/plugins/FindBadConstructs.cpp
index b79a64d..0d2c7cd 100644
--- a/tools/clang/plugins/FindBadConstructs.cpp
+++ b/tools/clang/plugins/FindBadConstructs.cpp
@@ -29,7 +29,7 @@ using namespace clang;
namespace {
bool TypeHasNonTrivialDtor(const Type* type) {
- if (const CXXRecordDecl* cxx_r = type->getCXXRecordDeclForPointerType())
+ if (const CXXRecordDecl* cxx_r = type->getPointeeCXXRecordDecl())
return cxx_r->hasTrivialDestructor();
return false;
@@ -417,7 +417,7 @@ class FindBadConstructsAction : public PluginASTAction {
check_virtuals_in_implementations_ = false;
} else {
parsed = false;
- llvm::errs() << "Unknown argument: " << args[i] << "\n";
+ llvm::errs() << "Unknown clang plugin argument: " << args[i] << "\n";
}
}
diff --git a/tools/clang/scripts/plugin_flags.sh b/tools/clang/scripts/plugin_flags.sh
index 217c5c3b..92eaad9 100755
--- a/tools/clang/scripts/plugin_flags.sh
+++ b/tools/clang/scripts/plugin_flags.sh
@@ -19,6 +19,4 @@ fi
echo -Xclang -load -Xclang $CLANG_LIB_PATH/libFindBadConstructs.$LIBSUFFIX \
-Xclang -add-plugin -Xclang find-bad-constructs \
-Xclang -plugin-arg-find-bad-constructs \
- -Xclang skip-virtuals-in-implementations \
- -Xclang -plugin-arg-find-bad-constructs \
- -Xclang check-cc-directory
+ -Xclang skip-virtuals-in-implementations
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index e944823..3e568b9 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -8,7 +8,7 @@
# Do NOT CHANGE this if you don't know what you're doing -- see
# https://code.google.com/p/chromium/wiki/UpdatingClang
# Reverting problematic clang rolls is safe, though.
-CLANG_REVISION=163674
+CLANG_REVISION=165787
THIS_DIR="$(dirname "${0}")"
LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"