From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Mon, 13 Aug 2018 22:07:11 +0000 (+0000)
Subject: Fix Clang warnings and bad #include filenames in r339595 and r339599.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09d5c6b600bdab633bffe2b2df25a7fbb8cad784;p=clang

Fix Clang warnings and bad #include filenames in r339595 and r339599.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339624 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObject.h b/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObject.h
index 07751a9236..ee9bcecb4e 100644
--- a/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObject.h
+++ b/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObject.h
@@ -32,6 +32,8 @@ class FieldNode {
 protected:
   const FieldRegion *FR;
 
+  ~FieldNode() = default;
+
 public:
   FieldNode(const FieldRegion *FR) : FR(FR) { assert(FR); }
 
diff --git a/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp b/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
index 876aebb477..4da5fa5461 100644
--- a/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
@@ -46,7 +46,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ClangSACheckers.h"
+#include "../ClangSACheckers.h"
 #include "UninitializedObject.h"
 #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/Core/Checker.h"
@@ -74,7 +74,7 @@ public:
 
 /// A basic field type, that is not a pointer or a reference, it's dynamic and
 /// static type is the same.
-class RegularField : public FieldNode {
+class RegularField final : public FieldNode {
 public:
   RegularField(const FieldRegion *FR) : FieldNode(FR) {}
 
@@ -84,7 +84,7 @@ public:
 
   virtual void printPrefix(llvm::raw_ostream &Out) const override {}
 
-  virtual void printNode(llvm::raw_ostream &Out) const {
+  virtual void printNode(llvm::raw_ostream &Out) const override {
     Out << getVariableName(getDecl());
   }
 
diff --git a/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedPointee.cpp b/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedPointee.cpp
index 61e96ef9ae..7f08d02894 100644
--- a/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedPointee.cpp
+++ b/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedPointee.cpp
@@ -18,7 +18,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ClangSACheckers.h"
+#include "../ClangSACheckers.h"
 #include "UninitializedObject.h"
 #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/Core/Checker.h"
@@ -31,7 +31,7 @@ using namespace clang::ento;
 namespace {
 
 /// Represents a pointer or a reference field.
-class LocField : public FieldNode {
+class LocField final : public FieldNode {
   /// We'll store whether the pointee or the pointer itself is uninitialited.
   const bool IsDereferenced;