aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Analysis/PrintfFormatString.cpp5
-rw-r--r--test/Sema/format-strings.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index d2bcbb04f9..35c620aded 100644
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -311,8 +311,11 @@ ArgTypeResult FormatSpecifier::getArgType(ASTContext &Ctx) const {
return ArgTypeResult();
}
- if (CS.isDoubleArg())
+ if (CS.isDoubleArg()) {
+ if (LM == AsLongDouble)
+ return Ctx.LongDoubleTy;
return Ctx.DoubleTy;
+ }
// FIXME: Handle other cases.
return ArgTypeResult();
diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c
index a055bfe182..d8f7e4f693 100644
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -167,6 +167,8 @@ void test10(int x, float f, int i, long long lli) {
// This is fine, because there is an implicit conversion to an int.
printf("%d", (unsigned char) 10); // no-warning
printf("%d", (long long) 10); // expected-warning{{conversion specifies type 'int' but the argument has type 'long long'}}
+ printf("%Lf\n", (long double) 1.0); // no-warning
+ printf("%f\n", (long double) 1.0); // expected-warning{{conversion specifies type 'double' but the argument has type 'long double'}}
}
typedef struct __aslclient *aslclient;