From: Hans Wennborg <hans@hanshq.net>
Date: Mon, 27 Oct 2014 22:28:50 +0000 (+0000)
Subject: Try to appease the C++ gods
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c637e9000585a37aae796817647a81725315f047;p=clang

Try to appease the C++ gods

Looks like some builds were not happy with the potentially-throwing move
constructor that was added in r220723, and reached for the implicitly
deleted copy constructor instead.

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

diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h
index 3a3640c63e..549cf1464a 100644
--- a/include/clang/Sema/Sema.h
+++ b/include/clang/Sema/Sema.h
@@ -2603,8 +2603,8 @@ private:
     TypoDiagnosticGenerator DiagHandler;
     TypoRecoveryCallback RecoveryHandler;
     TypoExprState();
-    TypoExprState(TypoExprState&& other);
-    TypoExprState& operator=(TypoExprState&& other);
+    TypoExprState(TypoExprState&& other) LLVM_NOEXCEPT;
+    TypoExprState& operator=(TypoExprState&& other) LLVM_NOEXCEPT;
   };
 
   /// \brief The set of unhandled TypoExprs and their associated state.
diff --git a/include/clang/Sema/SemaInternal.h b/include/clang/Sema/SemaInternal.h
index e90f9f0c50..8c75264a81 100644
--- a/include/clang/Sema/SemaInternal.h
+++ b/include/clang/Sema/SemaInternal.h
@@ -267,12 +267,12 @@ private:
 
 inline Sema::TypoExprState::TypoExprState() {}
 
-inline Sema::TypoExprState::TypoExprState(TypoExprState &&other) {
+inline Sema::TypoExprState::TypoExprState(TypoExprState &&other) LLVM_NOEXCEPT {
   *this = std::move(other);
 }
 
 inline Sema::TypoExprState &Sema::TypoExprState::operator=(
-    Sema::TypoExprState &&other) {
+    Sema::TypoExprState &&other) LLVM_NOEXCEPT {
   Consumer = std::move(other.Consumer);
   DiagHandler = std::move(other.DiagHandler);
   RecoveryHandler = std::move(RecoveryHandler);