diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-03-14 16:13:32 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-03-14 16:13:32 +0000 |
| commit | e981bb0e5ce371b63b3059c22b9bb3c37e80e980 (patch) | |
| tree | 3a683cb8efaeba25c131107cc1d07139502f4855 | |
| parent | 90186f8a3e8df34ed0757a78ea1c61046f99dfc4 (diff) | |
| download | bcm5719-llvm-e981bb0e5ce371b63b3059c22b9bb3c37e80e980.tar.gz bcm5719-llvm-e981bb0e5ce371b63b3059c22b9bb3c37e80e980.zip | |
-fwritable-strings should silence warnings about the deprecated string
-literal to char* conversion. Make it so.
llvm-svn: 127586
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/writable-strings-deprecated.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index ea93449d7b8..5701835c1a5 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -2273,7 +2273,8 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, ImpCastExprToType(From, ToType.getNonLValueExprType(Context), CK_NoOp, VK); - if (SCS.DeprecatedStringLiteralToCharPtr) + if (SCS.DeprecatedStringLiteralToCharPtr && + !getLangOptions().WritableStrings) Diag(From->getLocStart(), diag::warn_deprecated_string_literal_conversion) << ToType.getNonReferenceType(); diff --git a/clang/test/SemaCXX/writable-strings-deprecated.cpp b/clang/test/SemaCXX/writable-strings-deprecated.cpp index c89c8825642..66b59947981 100644 --- a/clang/test/SemaCXX/writable-strings-deprecated.cpp +++ b/clang/test/SemaCXX/writable-strings-deprecated.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -Wno-deprecated-writable-strings -verify %s +// RUN: %clang_cc1 -fsyntax-only -fwritable-strings -verify %s // rdar://8827606 char *fun(void) |
