Revert r149359. This was a hack to a problem with an easy workaround, and it doesn...

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

diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 5e8770888c5857e474ab4600e70eed8b6f491e76..4b507f456c490ecfcde05199889235ff376a80e1 100644 (file)
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -3699,24 +3699,15 @@ static void AnalyzeAssignment(Sema &S, BinaryOperator *E) {
 
 /// Diagnose an implicit cast;  purely a helper for CheckImplicitConversion.
 static void DiagnoseImpCast(Sema &S, Expr *E, QualType SourceType, QualType T, 
-                            SourceLocation CContext, unsigned diag,
-                            bool pruneControlFlow = false) {
-  if (pruneControlFlow) {
-    S.DiagRuntimeBehavior(E->getExprLoc(), E,
-                          S.PDiag(diag)
-                            << SourceType << T << E->getSourceRange()
-                            << SourceRange(CContext));
-    return;
-  }
+                            SourceLocation CContext, unsigned diag) {
   S.Diag(E->getExprLoc(), diag)
     << SourceType << T << E->getSourceRange() << SourceRange(CContext);
 }
 
 /// Diagnose an implicit cast;  purely a helper for CheckImplicitConversion.
 static void DiagnoseImpCast(Sema &S, Expr *E, QualType T,
-                            SourceLocation CContext, unsigned diag,
-                            bool pruneControlFlow = false) {
-  DiagnoseImpCast(S, E, E->getType(), T, CContext, diag, pruneControlFlow);
+                            SourceLocation CContext, unsigned diag) {
+  DiagnoseImpCast(S, E, E->getType(), T, CContext, diag);
 }
 
 /// Diagnose an implicit cast from a literal expression. Does not warn when the
@@ -3922,8 +3913,7 @@ void CheckImplicitConversion(Sema &S, Expr *E, QualType T,
       return;
     
     if (SourceRange.Width == 64 && TargetRange.Width == 32)
-      return DiagnoseImpCast(S, E, T, CC, diag::warn_impcast_integer_64_32,
-                             /* pruneControlFlow */ true);
+      return DiagnoseImpCast(S, E, T, CC, diag::warn_impcast_integer_64_32);
     return DiagnoseImpCast(S, E, T, CC, diag::warn_impcast_integer_precision);
   }
 

diff --git a/test/Sema/conversion-64-32.c b/test/Sema/conversion-64-32.c
index 62db7dcd2e7feba742cb1c871b1bb8f6175ae14f..112e995102c59e6aac0ab9e1842136934ae31e66 100644 (file)
--- a/test/Sema/conversion-64-32.c
+++ b/test/Sema/conversion-64-32.c
@@ -13,23 +13,3 @@ int4 test1(long2 a) {
   int4  v127 = a;  // no warning.
   return v127; 
 }
-
-// <rdar://problem/10759934>
-// Don't warn about -Wshorten-64-to-32 in unreachable code.
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-int rdar10759934() {
-  uint32_t thing = 0;
-  uint64_t thing2 = 0;
-
-  switch (sizeof(thing2)) {
-  case 8:
-    break;
-  case 4:
-    thing = thing2; // no-warning
-  default:
-    break;
-  }
-
-  return 0;
-}