diff options
| author | Tim Northover <tnorthover@apple.com> | 2017-05-24 22:18:35 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2017-05-24 22:18:35 +0000 |
| commit | 9d891185ad51c12a9051801464ca95fcb7633c7e (patch) | |
| tree | a893be8d2c5c20cdc74fec0d1514a624dc4359d6 /clang/lib/Sema/SemaLookup.cpp | |
| parent | a28414d7ec3d86c23d4aaf39ca71f67634ae4a04 (diff) | |
| download | bcm5719-llvm-9d891185ad51c12a9051801464ca95fcb7633c7e.tar.gz bcm5719-llvm-9d891185ad51c12a9051801464ca95fcb7633c7e.zip | |
Revert "Sema: allow imaginary constants via GNU extension if UDL overloads not present."
This reverts commit r303697. It broke libc++ tests that were specifically
checking incompatibility in C++14 mode.
llvm-svn: 303813
Diffstat (limited to 'clang/lib/Sema/SemaLookup.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaLookup.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index 48f4a0251f5..c97da740e4d 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -3066,7 +3066,7 @@ Sema::LiteralOperatorLookupResult Sema::LookupLiteralOperator(Scope *S, LookupResult &R, ArrayRef<QualType> ArgTys, bool AllowRaw, bool AllowTemplate, - bool AllowStringTemplate, bool DiagnoseMissing) { + bool AllowStringTemplate) { LookupName(R, S); assert(R.getResultKind() != LookupResult::Ambiguous && "literal operator lookup can't be ambiguous"); @@ -3167,15 +3167,11 @@ Sema::LookupLiteralOperator(Scope *S, LookupResult &R, return LOLR_StringTemplate; // Didn't find anything we could use. - if (DiagnoseMissing) { - Diag(R.getNameLoc(), diag::err_ovl_no_viable_literal_operator) - << R.getLookupName() << (int)ArgTys.size() << ArgTys[0] - << (ArgTys.size() == 2 ? ArgTys[1] : QualType()) << AllowRaw - << (AllowTemplate || AllowStringTemplate); - return LOLR_Error; - } - - return LOLR_ErrorNoDiagnostic; + Diag(R.getNameLoc(), diag::err_ovl_no_viable_literal_operator) + << R.getLookupName() << (int)ArgTys.size() << ArgTys[0] + << (ArgTys.size() == 2 ? ArgTys[1] : QualType()) << AllowRaw + << (AllowTemplate || AllowStringTemplate); + return LOLR_Error; } void ADLResult::insert(NamedDecl *New) { |
