commit 1da70394f68a5cc053661894f4567b59b670d68f
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 16bb3a31217bed5907f902e9d222ae808edafb7a
parent 9ec3c4f5a7966b64310c53948bfb93252d87e77e

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

llvm-svn: 149003

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 0eb8d28..fdcad08 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/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(),