Permit the "if" literal suffix with Microsoft extensions enabled.

[pcc]

Approved by Aaron here: http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20140526/106567.html

[pcc]

Closed by commit rL209859 (authored by @pcc).

lib/Lex/LiteralSupport.cpp

case 'L':
         ++s;  // Eat both of them.
       } else {
         isLong = true;
       }
       continue;  // Success.
     case 'i':
     case 'I':
       if (PP.getLangOpts().MicrosoftExt) {
-        if (isFPConstant || isLong || isLongLong) break;
+        if (isLong || isLongLong) break;
 
         // Allow i8, i16, i32, i64, and i128.
         if (s + 1 != ThisTokEnd) {
           switch (s[1]) {
             case '8':
+              if (isFPConstant) break;
               s += 2; // i8 suffix
               isMicrosoftInteger = true;
               break;
             case '1':
+              if (isFPConstant) break;
               if (s + 2 == ThisTokEnd) break;
               if (s[2] == '6') {
                 s += 3; // i16 suffix
                 isMicrosoftInteger = true;
               }
               else if (s[2] == '2') {
                 if (s + 3 == ThisTokEnd) break;
                 if (s[3] == '8') {
                   s += 4; // i128 suffix
                   isMicrosoftInteger = true;
                 }
               }
               break;
             case '3':
+              if (isFPConstant) break;
               if (s + 2 == ThisTokEnd) break;
               if (s[2] == '2') {
                 s += 3; // i32 suffix
                 isLong = true;
                 isMicrosoftInteger = true;
               }
               break;
             case '6':
+              if (isFPConstant) break;
               if (s + 2 == ThisTokEnd) break;
               if (s[2] == '4') {
                 s += 3; // i64 suffix
                 isLongLong = true;
                 isMicrosoftInteger = true;
               }
               break;
             default:
               break;
           }
+          if (isMicrosoftInteger)
             break;
         }
       }
       // "i", "if", and "il" are user-defined suffixes in C++1y.
       if (PP.getLangOpts().CPlusPlus1y && *s == 'i')
         break;
       // fall through.
     case 'j':
     case 'J':

test/Lexer/ms-extensions.c

 // RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s
 // RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility %s
 
 __int8 x1  = 3i8;
 __int16 x2 = 4i16;
 __int32 x3 = 5i32;
 __int64 x5 = 0x42i64;
 __int64 x6 = 0x42I64;
 __int64 x4 = 70000000i128;
 
 __int64 y = 0x42i64u;  // expected-error {{invalid suffix}}
 __int64 w = 0x43ui64; 
 __int64 z = 9Li64;  // expected-error {{invalid suffix}}
 __int64 q = 10lli64;  // expected-error {{invalid suffix}}
 
+__complex double c1 = 1i;
+__complex double c2 = 1.0i;
+__complex float c3 = 1.0if;
+
 // radar 7562363
 #define ULLONG_MAX 0xffffffffffffffffui64
 #define UINT 0xffffffffui32
 #define USHORT 0xffffui16
 #define UCHAR 0xffui8
 
 void a() {
   unsigned long long m = ULLONG_MAX;