diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
--- a/clang/include/clang/Basic/DiagnosticGroups.td
+++ b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -85,7 +85,9 @@
   DiagGroup<"objc-signed-char-bool-implicit-int-conversion">;
 def ImplicitIntConversion : DiagGroup<"implicit-int-conversion",
                                      [ObjCSignedCharBoolImplicitIntConversion]>;
-def ImplicitIntFloatConversion : DiagGroup<"implicit-int-float-conversion">;
+def ImplicitConstIntFloatConversion : DiagGroup<"implicit-const-int-float-conversion">;
+def ImplicitIntFloatConversion : DiagGroup<"implicit-int-float-conversion",
+ [ImplicitConstIntFloatConversion]>;
 def ObjCSignedCharBoolImplicitFloatConversion :
   DiagGroup<"objc-signed-char-bool-implicit-float-conversion">;
 def ImplicitFloatConversion : DiagGroup<"implicit-float-conversion",
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -3549,7 +3549,7 @@
   InGroup<ImplicitIntFloatConversion>, DefaultIgnore;
 def warn_impcast_integer_float_precision_constant : Warning<
   "implicit conversion from %2 to %3 changes value from %0 to %1">,
-  InGroup<ImplicitIntFloatConversion>;
+  InGroup<ImplicitConstIntFloatConversion>;
 
 def warn_impcast_float_to_integer : Warning<
   "implicit conversion from %0 to %1 changes value from %2 to %3">,
diff --git a/clang/test/Sema/implicit-int-float-conversion.c b/clang/test/Sema/implicit-int-float-conversion.c
--- a/clang/test/Sema/implicit-int-float-conversion.c
+++ b/clang/test/Sema/implicit-int-float-conversion.c
@@ -1,8 +1,12 @@
-// RUN: %clang_cc1 %s -verify -Wno-conversion -Wimplicit-int-float-conversion
+// RUN: %clang_cc1 %s -verify
+// RUN: %clang_cc1 %s -verify -Wimplicit-const-int-float-conversion
+// RUN: %clang_cc1 %s -DNONCONST=1 -verify -Wimplicit-int-float-conversion
 
+#ifdef NONCONST
 long testReturn(long a, float b) {
   return a + b; // expected-warning {{implicit conversion from 'long' to 'float' may lose precision}}
 }
+#endif
 
 void testAssignment() {
   float f = 222222;
@@ -12,7 +16,9 @@
   float ffff = 222222222222UL; // expected-warning {{changes value from 222222222222 to 222222221312}}
 
   long l = 222222222222L;
+#ifdef NONCOST
   float fff = l; // expected-warning {{implicit conversion from 'long' to 'float' may lose precision}}
+#endif
 }
 
 void testExpression() {
@@ -24,7 +30,9 @@
   float c = 22222222 + 22222223; // expected-warning {{implicit conversion from 'int' to 'float' changes value from 44444445 to 44444444}}
 
   int i = 0;
+#ifdef NONCONST
   float d = i + a; // expected-warning {{implicit conversion from 'int' to 'float' may lose precision}}
+#endif
 
   double e = 0.0;
   double f = i + e;
@@ -36,5 +44,7 @@
   float a = {222222222222L}; // expected-warning {{changes value from 222222222222 to 222222221312}}
 
   long b = 222222222222L;
+#ifdef NONCONST
   float c = {b}; // expected-warning {{implicit conversion from 'long' to 'float' may lose precision}}
+#endif
 }