r320493 - Revert a part of 320489 that was submitted unintentionally.

[Erich Keane via cfe-commits]

Author: erichkeane
Date: Tue Dec 12 08:22:31 2017
New Revision: 320493

URL: http://llvm.org/viewvc/llvm-project?rev=320493&view=rev
Log:
Revert a part of 320489 that was submitted unintentionally.

Modified:
    cfe/trunk/lib/Sema/SemaExprCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=320493&r1=320492&r2=320493&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Tue Dec 12 08:22:31 2017
@@ -4958,7 +4958,7 @@ static bool EvaluateBinaryTypeTrait(Sema
     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
 
     llvm_unreachable("unhandled type trait");
     return false;
-    }
   }
     default: llvm_unreachable("not a BTT");
   }