[cfe-commits] r135152 - in /cfe/trunk: lib/Analysis/FormatString.cpp test/Sema/format-strings-fixit.c test/Sema/format-strings-i386.c test/Sema/format-strings.c

[Ted Kremenek]

Author: kremenek
Date: Thu Jul 14 12:05:32 2011
New Revision: 135152

URL: http://llvm.org/viewvc/llvm-project?rev=135152&view=rev
Log:
Revert r135147 and r135075.  The consensus was that this wasn't the right thing to do.

Removed:
    cfe/trunk/test/Sema/format-strings-i386.c
Modified:
    cfe/trunk/lib/Analysis/FormatString.cpp
    cfe/trunk/test/Sema/format-strings-fixit.c
    cfe/trunk/test/Sema/format-strings.c

Modified: cfe/trunk/lib/Analysis/FormatString.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/FormatString.cpp?rev=135152&r1=135151&r2=135152&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/FormatString.cpp (original)
+++ cfe/trunk/lib/Analysis/FormatString.cpp Thu Jul 14 12:05:32 2011
@@ -206,10 +206,6 @@
 // Methods on ArgTypeResult.
 //===----------------------------------------------------------------------===//
 
-static bool hasSameSize(ASTContext &astContext, QualType typeA, QualType typeB) {
-  return astContext.getTypeSize(typeA) == astContext.getTypeSize(typeB);
-}
-
 bool ArgTypeResult::matchesType(ASTContext &C, QualType argTy) const {
   switch (K) {
     case InvalidTy:
@@ -224,31 +220,33 @@
       if (T == argTy)
         return true;
       // Check for "compatible types".
-      if (const BuiltinType *BT = argTy->getAs<BuiltinType>()) {
-        if (!T->isIntegerType())
-          return false;
+      if (const BuiltinType *BT = argTy->getAs<BuiltinType>())
         switch (BT->getKind()) {
           default:
             break;
           case BuiltinType::Char_S:
           case BuiltinType::SChar:
+            return T == C.UnsignedCharTy;
           case BuiltinType::Char_U:
-          case BuiltinType::UChar:
-            return hasSameSize(C, T, C.UnsignedCharTy);
+          case BuiltinType::UChar:                    
+            return T == C.SignedCharTy;
           case BuiltinType::Short:
+            return T == C.UnsignedShortTy;
           case BuiltinType::UShort:
-            return hasSameSize(C, T, C.ShortTy);
+            return T == C.ShortTy;
           case BuiltinType::Int:
+            return T == C.UnsignedIntTy;
           case BuiltinType::UInt:
-            return hasSameSize(C, T, C.IntTy);
+            return T == C.IntTy;
           case BuiltinType::Long:
+            return T == C.UnsignedLongTy;
           case BuiltinType::ULong:
-            return hasSameSize(C, T, C.LongTy);
+            return T == C.LongTy;
           case BuiltinType::LongLong:
+            return T == C.UnsignedLongLongTy;
           case BuiltinType::ULongLong:
-            return hasSameSize(C, T, C.LongLongTy);
+            return T == C.LongLongTy;
         }
-      }
       return false;
     }
 

Modified: cfe/trunk/test/Sema/format-strings-fixit.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings-fixit.c?rev=135152&r1=135151&r2=135152&view=diff
==============================================================================
--- cfe/trunk/test/Sema/format-strings-fixit.c (original)
+++ cfe/trunk/test/Sema/format-strings-fixit.c Thu Jul 14 12:05:32 2011
@@ -1,7 +1,7 @@
 // RUN: cp %s %t
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.7.0 -pedantic -Wall -fixit %t || true
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.7.0 -fsyntax-only -pedantic -Wall -Werror %t
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.7.0 -E -o - %t | FileCheck %s
+// RUN: %clang_cc1 -pedantic -Wall -fixit %t || true
+// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror %t
+// RUN: %clang_cc1 -E -o - %t | FileCheck %s
 
 /* This is a test of the various code modification hints that are
    provided as part of warning or extension diagnostics. All of the

Removed: cfe/trunk/test/Sema/format-strings-i386.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings-i386.c?rev=135151&view=auto
==============================================================================
--- cfe/trunk/test/Sema/format-strings-i386.c (original)
+++ cfe/trunk/test/Sema/format-strings-i386.c (removed)
@@ -1,15 +0,0 @@
-// RUN: %clang_cc1 -triple i386-apple-macosx10.7.0 -fsyntax-only -verify -Wformat-nonliteral %s
-
-int printf(const char *restrict, ...);
-
-// Test that 'long' is compatible with 'int' on 32-bit.
-typedef unsigned int UInt32;
-void test_rdar_9763999() {
- UInt32 x = 7;
- printf("x = %u\n", x); // no-warning
-}
-
-void test_positive() {
-  printf("%d", "hello"); // expected-warning {{conversion specifies type 'int' but the argument has type 'char *'}}
-}
-

Modified: cfe/trunk/test/Sema/format-strings.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings.c?rev=135152&r1=135151&r2=135152&view=diff
==============================================================================
--- cfe/trunk/test/Sema/format-strings.c (original)
+++ cfe/trunk/test/Sema/format-strings.c Thu Jul 14 12:05:32 2011
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-macosx10.7.0 -fsyntax-only -verify -Wformat-nonliteral %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral %s
 
 #include <stdarg.h>
 typedef __typeof(sizeof(int)) size_t;