[Cmake-commits] CMake branch, master, updated. v3.12.2-729-g5f702f9

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5f702f97a89129a39bcf1ecf9823d60a2793e35e (commit)
       via  3c8187f68730b180cd6fad898eb81bdeaf488bb8 (commit)
       via  6c2af9d302f1c893219f2aad014a2b183bb438a1 (commit)
      from  3181f8405bc949affb8ea321ec7746b44717fd99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f702f97a89129a39bcf1ecf9823d60a2793e35e
commit 5f702f97a89129a39bcf1ecf9823d60a2793e35e
Merge: 3181f84 3c8187f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 26 14:00:45 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 26 10:01:09 2018 -0400

    Merge topic 'refactor-backtrace'
    
    3c8187f687 clang-tidy: restore 'misc-noexcept-move-constructor'
    6c2af9d302 cmListFileCache: Add missing assertion in backtrace Top method
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2415


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c8187f68730b180cd6fad898eb81bdeaf488bb8
commit 3c8187f68730b180cd6fad898eb81bdeaf488bb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 26 06:38:52 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 26 06:38:52 2018 -0400

    clang-tidy: restore 'misc-noexcept-move-constructor'
    
    We disabled this in commit 1fe0d72eb6 (clang-tidy: exclude
    'misc-noexcept-move-constructor', 2018-09-24) due to false positives.
    Restore it and use a NOLINT comment to suppress them instead.

diff --git a/.clang-tidy b/.clang-tidy
index ebe3c20..8d79b0c 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -5,7 +5,6 @@ misc-*,\
 -misc-incorrect-roundings,\
 -misc-macro-parentheses,\
 -misc-misplaced-widening-cast,\
--misc-noexcept-move-constructor,\
 -misc-static-assert,\
 modernize-*,\
 -modernize-deprecated-headers,\
diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h
index faddec7..3d3afdf 100644
--- a/Source/cmListFileCache.h
+++ b/Source/cmListFileCache.h
@@ -124,9 +124,11 @@ public:
 
   // Backtraces may be copied, moved, and assigned as values.
   cmListFileBacktrace(cmListFileBacktrace const&) = default;
-  cmListFileBacktrace(cmListFileBacktrace&&) noexcept = default;
+  cmListFileBacktrace(cmListFileBacktrace&&) // NOLINT(clang-tidy)
+    noexcept = default;
   cmListFileBacktrace& operator=(cmListFileBacktrace const&) = default;
-  cmListFileBacktrace& operator=(cmListFileBacktrace&&) noexcept = default;
+  cmListFileBacktrace& operator=(cmListFileBacktrace&&) // NOLINT(clang-tidy)
+    noexcept = default;
   ~cmListFileBacktrace() = default;
 
   cmStateSnapshot GetBottom() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c2af9d302f1c893219f2aad014a2b183bb438a1
commit 6c2af9d302f1c893219f2aad014a2b183bb438a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 25 10:41:29 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 26 06:32:21 2018 -0400

    cmListFileCache: Add missing assertion in backtrace Top method
    
    We can only get the top of a stack that has at least one call.
    Update the method's comment accordingly.

diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index e465e1a..4d7e1e2 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -377,6 +377,7 @@ cmListFileBacktrace cmListFileBacktrace::Pop() const
 cmListFileContext const& cmListFileBacktrace::Top() const
 {
   assert(this->TopEntry);
+  assert(!this->TopEntry->IsBottom());
   return this->TopEntry->Context;
 }
 
diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h
index 2c91f7a..faddec7 100644
--- a/Source/cmListFileCache.h
+++ b/Source/cmListFileCache.h
@@ -144,7 +144,7 @@ public:
   cmListFileBacktrace Pop() const;
 
   // Get the context at the top of the backtrace.
-  // Returns an empty context if the backtrace is empty.
+  // This may be called only if Empty() would return false.
   cmListFileContext const& Top() const;
 
   // Print the top of the backtrace.

-----------------------------------------------------------------------

Summary of changes:
 .clang-tidy                | 1 -
 Source/cmListFileCache.cxx | 1 +
 Source/cmListFileCache.h   | 8 +++++---
 3 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake