commit ceccab908bd7824751b1def127272ec04dd4732b
author Eli Friedman <eli.friedman@gmail.com> Thu Jan 26 00:26:18 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Thu Jan 26 00:26:18 2012 +0000
tree c52b2ef8b9090370dedfe59fd55a72db72afcb17
parent 26f0e4e7ab534fb42485c930f20a424ecc8c9830

Slight refactoring; catch yet another case where we were missing an lvalue-to-rvalue conversion.



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

lib/Sema/SemaStmt.cpp

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index 0eb8d28..fdcad08 100644
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -495,12 +495,8 @@
   if (!Cond)
     return StmtError();
 
-  CondResult = DefaultFunctionArrayLvalueConversion(Cond);
-  if (CondResult.isInvalid())
-    return StmtError();
-
   CondResult
-    = ConvertToIntegralOrEnumerationType(SwitchLoc, CondResult.take(),
+    = ConvertToIntegralOrEnumerationType(SwitchLoc, Cond,
                           PDiag(diag::err_typecheck_statement_requires_integer),
                                    PDiag(diag::err_switch_incomplete_class_type)
                                      << Cond->getSourceRange(),