From e380e353485c3479abe645d3b6da9e007057a079 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 16 Aug 2019 16:25:48 +0200
Subject: Adapt loplugin:nullptr to RecursiveASTVisitior::TraverseInitListExpr
 change

...<https://github.com/llvm/llvm-project/commit/
0a42fe70a566f22599e04a6f1344ca2dc5565e17> "[AST] Treat semantic form of
InitListExpr as implicit code in traversals"

Change-Id: Ifd17009fcc6933abf0e9178dbe47fb9c14b274b7
Reviewed-on: https://gerrit.libreoffice.org/77595
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 compilerplugins/clang/nullptr.cxx      |  8 ++++++++
 compilerplugins/clang/test/nullptr.cxx | 23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 compilerplugins/clang/test/nullptr.cxx

(limited to 'compilerplugins')

diff --git a/compilerplugins/clang/nullptr.cxx b/compilerplugins/clang/nullptr.cxx
index bcdf606c13e3..30458d7f7f5a 100644
--- a/compilerplugins/clang/nullptr.cxx
+++ b/compilerplugins/clang/nullptr.cxx
@@ -75,6 +75,8 @@ public:
 
     bool TraverseLinkageSpecDecl(LinkageSpecDecl * decl);
 
+    bool TraverseInitListExpr(InitListExpr * expr, DataRecursionQueue * queue = nullptr);
+
     // bool shouldVisitTemplateInstantiations() const { return true; }
 
 private:
@@ -231,6 +233,12 @@ bool Nullptr::TraverseLinkageSpecDecl(LinkageSpecDecl * decl) {
     return ret;
 }
 
+bool Nullptr::TraverseInitListExpr(InitListExpr * expr, DataRecursionQueue * queue) {
+    return WalkUpFromInitListExpr(expr)
+        && TraverseSynOrSemInitListExpr(
+            expr->isSemanticForm() ? expr : expr->getSemanticForm(), queue);
+}
+
 bool Nullptr::isInLokIncludeFile(SourceLocation spellingLocation) const {
     return loplugin::hasPathnamePrefix(
         getFileNameOfSpellingLoc(spellingLocation),
diff --git a/compilerplugins/clang/test/nullptr.cxx b/compilerplugins/clang/test/nullptr.cxx
new file mode 100644
index 000000000000..bf7376cb6562
--- /dev/null
+++ b/compilerplugins/clang/test/nullptr.cxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+struct S
+{
+    void* p;
+};
+
+int main()
+{
+    S s{
+        0 // expected-error {{NullToPointer ValueDependentIsNotNull ZeroLiteral -> nullptr [loplugin:nullptr]}}
+    };
+    (void)s;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
-- 
cgit