From e9e3631aba58eb400c9c4e16c2ae5e038e7ebfe3 Mon Sep 17 00:00:00 2001 From: Sunil Srivastava Date: Tue, 26 Apr 2016 23:19:00 +0000 Subject: [PATCH] Check 'r' and 'y specifiers of freebsd_kernel_printf format strings on PS4 This is an addendum to r229921. llvm-svn: 267625 --- clang/lib/Analysis/FormatString.cpp | 4 ++-- clang/test/Sema/format-strings-freebsd.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/clang/lib/Analysis/FormatString.cpp b/clang/lib/Analysis/FormatString.cpp index badc710..83d08b5 100644 --- a/clang/lib/Analysis/FormatString.cpp +++ b/clang/lib/Analysis/FormatString.cpp @@ -694,7 +694,7 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target) const { return true; case ConversionSpecifier::FreeBSDrArg: case ConversionSpecifier::FreeBSDyArg: - return Target.getTriple().isOSFreeBSD(); + return Target.getTriple().isOSFreeBSD() || Target.getTriple().isPS4(); default: return false; } @@ -727,7 +727,7 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target) const { return true; case ConversionSpecifier::FreeBSDrArg: case ConversionSpecifier::FreeBSDyArg: - return Target.getTriple().isOSFreeBSD(); + return Target.getTriple().isOSFreeBSD() || Target.getTriple().isPS4(); default: return false; } diff --git a/clang/test/Sema/format-strings-freebsd.c b/clang/test/Sema/format-strings-freebsd.c index cdf273a..965d7c28 100644 --- a/clang/test/Sema/format-strings-freebsd.c +++ b/clang/test/Sema/format-strings-freebsd.c @@ -1,10 +1,11 @@ // RUN: %clang_cc1 -fsyntax-only -verify -triple i386-unknown-freebsd %s // RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-unknown-freebsd %s +// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-scei-ps4 %s // Test FreeBSD kernel printf extensions. int freebsd_kernel_printf(const char *, ...) __attribute__((__format__(__freebsd_kprintf__, 1, 2))); -void check_freebsd_kernel_extensions(int i, long l, char *s) +void check_freebsd_kernel_extensions(int i, long l, char *s, short h) { // %b expects an int and a char * freebsd_kernel_printf("reg=%b\n", i, "\10\2BITTWO\1BITONE\n"); // no-warning @@ -32,6 +33,12 @@ void check_freebsd_kernel_extensions(int i, long l, char *s) freebsd_kernel_printf("%lr", i); // expected-warning{{format specifies type 'long' but the argument has type 'int'}} freebsd_kernel_printf("%lr", l); // no-warning + // h modifier expects a short + freebsd_kernel_printf("%hr", i); // expected-warning{{format specifies type 'short' but the argument has type 'int'}} + freebsd_kernel_printf("%hr", h); // no-warning + freebsd_kernel_printf("%hy", i); // expected-warning{{format specifies type 'short' but the argument has type 'int'}} + freebsd_kernel_printf("%hy", h); // no-warning + // %y expects an int freebsd_kernel_printf("%y", i); // no-warning freebsd_kernel_printf("%y", l); // expected-warning{{format specifies type 'int' but the argument has type 'long'}} -- 2.7.4