From: Erich Keane <erich.keane@intel.com>
Date: Tue, 12 Dec 2017 16:22:31 +0000 (+0000)
Subject: Revert a part of 320489 that was submitted unintentionally.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb61fc53dc997bca3bee98d898d3406d0acb221c;p=clang

Revert a part of 320489 that was submitted unintentionally.


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

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 641d583944..9c842ded1e 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -4958,7 +4958,7 @@ static bool EvaluateBinaryTypeTrait(Sema &Self, TypeTrait BTT, QualType LhsT,
     EnterExpressionEvaluationContext Unevaluated(
         Self, Sema::ExpressionEvaluationContext::Unevaluated);
     Sema::SFINAETrap SFINAE(Self, /*AccessCheckingSFINAE=*/true);
-    Sema::ContextRAII TUContext(Self, Self.Context.getTranslationUnitDecl()); {
+    Sema::ContextRAII TUContext(Self, Self.Context.getTranslationUnitDecl());
     ExprResult Result = Self.BuildBinOp(/*S=*/nullptr, KeyLoc, BO_Assign, &Lhs,
                                         &Rhs);
     if (Result.isInvalid() || SFINAE.hasErrorOccurred())
@@ -4981,7 +4981,6 @@ static bool EvaluateBinaryTypeTrait(Sema &Self, TypeTrait BTT, QualType LhsT,
 
     llvm_unreachable("unhandled type trait");
     return false;
-    }
   }
     default: llvm_unreachable("not a BTT");
   }