replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Lexer: always allow imaginary constants in GNU mode." 

This reverts r310423. It was committed by mistake, I intended to commit the
improved diagnostics for implicit conversions instead.

llvm-svn: 310426
This commit is contained in:
Tim Northover 2017-08-08 23:17:51 +00:00
parent 8dd90fb54b
commit d1fafc8b05
4 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Lex/LiteralSupport.cpp
View File

@ -659,7 +659,7 @@ NumericLiteralParser::NumericLiteralParser(StringRef TokSpelling,
}
}
// "i", "if", and "il" are user-defined suffixes in C++1y.
if (*s == 'i' && !PP.getLangOpts().GNUMode)
if (*s == 'i' && PP.getLangOpts().CPlusPlus14)
break;
// fall through.
case 'j':

25
clang/test/Lexer/imaginary-constants.cpp
View File

@ -1,25 +0,0 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s -std=gnu++98 -DHAVE_IMAGINARY=1
// RUN: %clang_cc1 -fsyntax-only -verify %s -std=gnu++11 -DHAVE_IMAGINARY=1
// RUN: %clang_cc1 -fsyntax-only -verify %s -std=gnu++14 -DHAVE_IMAGINARY=1
// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++98 -DHAVE_IMAGINARY=0
// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++11 -DHAVE_IMAGINARY=0
// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++14 -DHAVE_IMAGINARY=0 -DCXX14=1
// Imaginary constants are a GNU extension that became problematic when C++14
// defined its own versions. Until then they're supported even in
// standards-compliant mode.
#if HAVE_IMAGINARY
// expected-no-diagnostics
#elif CXX14
// expected-error@+9 {{no matching literal operator for call to 'operator""i' with argument of type 'unsigned long long' or 'const char *', and no matching literal operator template}}
// expected-error@+9 {{no matching literal operator for call to 'operator""il' with argument of type 'unsigned long long' or 'const char *', and no matching literal operator template}}
// expected-error@+9 {{invalid suffix 'ill' on integer constant}}
#else
// expected-error@+5 {{invalid suffix 'i' on integer constant}}
// expected-error@+5 {{invalid suffix 'il' on integer constant}}
// expected-error@+7 {{invalid suffix 'ill' on integer constant}}
#endif
_Complex int val1 = 2i;
_Complex long val2 = 2il;
_Complex long long val3 = 2ill;

2
clang/test/SemaCXX/constexpr-printing.cpp
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 %s -std=gnu++11 -fsyntax-only -verify -triple x86_64-linux-gnu
// RUN: %clang_cc1 %s -std=c++11 -fsyntax-only -verify -triple x86_64-linux-gnu
struct S;
constexpr int extract(const S &s);

2
clang/unittests/AST/DeclTest.cpp
View File

@ -26,7 +26,7 @@ TEST(Decl, CleansUpAPValues) {
// This is a regression test for a memory leak in APValues for structs that
// allocate memory. This test only fails if run under valgrind with full leak
// checking enabled.
std::vector<std::string> Args(1, "-std=gnu++11");
std::vector<std::string> Args(1, "-std=c++11");
Args.push_back("-fno-ms-extensions");
ASSERT_TRUE(runToolOnCodeWithArgs(
Factory->create(),