commit 1a3b8fd8af08e4d06cfa70f227d4f4c55242f614
author Erich Keane <erich.keane@intel.com> Tue Dec 12 16:22:31 2017 +0000
committer Erich Keane <erich.keane@intel.com> Tue Dec 12 16:22:31 2017 +0000
tree 1f8719b668d7c81f0700adc41c65a54b432e3165
parent 68f9accf51a0f718bf1d6c41d543be5ee37eccd7

Revert a part of 320489 that was submitted unintentionally.

llvm-svn: 320493

clang/lib/Sema/SemaExprCXX.cpp

diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 641d583..9c842de 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -4958,7 +4958,7 @@
     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 @@
 
     llvm_unreachable("unhandled type trait");
     return false;
-    }
   }
     default: llvm_unreachable("not a BTT");
   }