Skip to content

Commit 6856ada

Browse files
committed
[lldb] Allow evaluating expressions in C++20 mode
This patch allows users to evaluate expressions using `expr -l c++20`. Currently DWARF keeps the CU's at `DW_AT_language` at `DW_LANG_C_plus_plus_14` even when compiling with `-std=c++20`. So even in "C++20 programs" expression evaluation will by default be performed in `C++11` mode for now. Enabling `C++14` has been previously attempted at https://reviews.llvm.org/D80308 There are some remaining issues around evaluating C++20 expressions. Mainly, lack of support for C++20 AST nodes in `clang::ASTImporter`. But these can be addressed in follow-up patches. (cherry picked from commit 89cd0e8)
1 parent f6bcfd4 commit 6856ada

File tree

9 files changed

+60
-6
lines changed

9 files changed

+60
-6
lines changed

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,16 @@ ClangExpressionParser::ClangExpressionParser(
541541
// be re-evaluated in the future.
542542
lang_opts.CPlusPlus11 = true;
543543
break;
544+
case lldb::eLanguageTypeC_plus_plus_20:
545+
lang_opts.CPlusPlus20 = true;
546+
LLVM_FALLTHROUGH;
547+
case lldb::eLanguageTypeC_plus_plus_17:
548+
// FIXME: add a separate case for CPlusPlus14. Currently folded into C++17
549+
// because C++14 is the default standard for Clang but enabling CPlusPlus14
550+
// expression evaluatino doesn't pass the test-suite cleanly.
551+
lang_opts.CPlusPlus14 = true;
552+
lang_opts.CPlusPlus17 = true;
553+
LLVM_FALLTHROUGH;
544554
case lldb::eLanguageTypeC_plus_plus:
545555
case lldb::eLanguageTypeC_plus_plus_11:
546556
case lldb::eLanguageTypeC_plus_plus_14:

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ TokenVerifier::TokenVerifier(std::string body) {
262262
LangOptions Opts;
263263
Opts.ObjC = true;
264264
Opts.DollarIdents = true;
265-
Opts.CPlusPlus17 = true;
265+
Opts.CPlusPlus20 = true;
266266
Opts.LineComment = true;
267267

268268
Lexer lex(FID, buf->getMemBufferRef(), SM, Opts);

lldb/source/Plugins/Language/CPlusPlus/CPlusPlusNameParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ static const clang::LangOptions &GetLangOptions() {
706706
g_options.CPlusPlus11 = true;
707707
g_options.CPlusPlus14 = true;
708708
g_options.CPlusPlus17 = true;
709+
g_options.CPlusPlus20 = true;
709710
});
710711
return g_options;
711712
}

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ bool TypeSystemClang::IsOperator(llvm::StringRef name,
399399
.Case("=", clang::OO_Equal)
400400
.Case("==", clang::OO_EqualEqual)
401401
.Case("<", clang::OO_Less)
402+
.Case("<=>", clang::OO_Spaceship)
402403
.Case("<<", clang::OO_LessLess)
403404
.Case("<<=", clang::OO_LessLessEqual)
404405
.Case("<=", clang::OO_LessEqual)
@@ -510,6 +511,9 @@ static void ParseLangArgs(LangOptions &Opts, InputKind IK, const char *triple) {
510511
Opts.C99 = Std.isC99();
511512
Opts.CPlusPlus = Std.isCPlusPlus();
512513
Opts.CPlusPlus11 = Std.isCPlusPlus11();
514+
Opts.CPlusPlus14 = Std.isCPlusPlus14();
515+
Opts.CPlusPlus17 = Std.isCPlusPlus17();
516+
Opts.CPlusPlus20 = Std.isCPlusPlus20();
513517
Opts.Digraphs = Std.hasDigraphs();
514518
Opts.GNUMode = Std.isGNUMode();
515519
Opts.GNUInline = !Std.isC99();
@@ -628,6 +632,8 @@ LanguageSet TypeSystemClang::GetSupportedLanguagesForTypes() {
628632
languages.Insert(lldb::eLanguageTypeC_plus_plus_11);
629633
languages.Insert(lldb::eLanguageTypeC11);
630634
languages.Insert(lldb::eLanguageTypeC_plus_plus_14);
635+
languages.Insert(lldb::eLanguageTypeC_plus_plus_17);
636+
languages.Insert(lldb::eLanguageTypeC_plus_plus_20);
631637
return languages;
632638
}
633639

@@ -638,6 +644,8 @@ LanguageSet TypeSystemClang::GetSupportedLanguagesForExpressions() {
638644
languages.Insert(lldb::eLanguageTypeC_plus_plus_03);
639645
languages.Insert(lldb::eLanguageTypeC_plus_plus_11);
640646
languages.Insert(lldb::eLanguageTypeC_plus_plus_14);
647+
languages.Insert(lldb::eLanguageTypeC_plus_plus_17);
648+
languages.Insert(lldb::eLanguageTypeC_plus_plus_20);
641649
return languages;
642650
}
643651

lldb/source/Target/Language.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ bool Language::LanguageIsCPlusPlus(LanguageType language) {
257257
case eLanguageTypeC_plus_plus_03:
258258
case eLanguageTypeC_plus_plus_11:
259259
case eLanguageTypeC_plus_plus_14:
260+
case eLanguageTypeC_plus_plus_17:
261+
case eLanguageTypeC_plus_plus_20:
260262
case eLanguageTypeObjC_plus_plus:
261263
return true;
262264
default:
@@ -296,6 +298,8 @@ bool Language::LanguageIsCFamily(LanguageType language) {
296298
case eLanguageTypeC_plus_plus_03:
297299
case eLanguageTypeC_plus_plus_11:
298300
case eLanguageTypeC_plus_plus_14:
301+
case eLanguageTypeC_plus_plus_17:
302+
case eLanguageTypeC_plus_plus_20:
299303
case eLanguageTypeObjC_plus_plus:
300304
case eLanguageTypeObjC:
301305
return true;
@@ -319,6 +323,8 @@ LanguageType Language::GetPrimaryLanguage(LanguageType language) {
319323
case eLanguageTypeC_plus_plus_03:
320324
case eLanguageTypeC_plus_plus_11:
321325
case eLanguageTypeC_plus_plus_14:
326+
case eLanguageTypeC_plus_plus_17:
327+
case eLanguageTypeC_plus_plus_20:
322328
return eLanguageTypeC_plus_plus;
323329
case eLanguageTypeC:
324330
case eLanguageTypeC89:
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CXX_SOURCES := main.cpp
2+
CXXFLAGS_EXTRAS := -std=c++20
3+
4+
include Makefile.rules
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import lldb
2+
from lldbsuite.test.decorators import *
3+
from lldbsuite.test.lldbtest import *
4+
from lldbsuite.test import lldbutil
5+
6+
class TestCPP20Standard(TestBase):
7+
def test_cpp20(self):
8+
"""
9+
Tests that we can evaluate an expression in C++20 mode
10+
"""
11+
self.build()
12+
lldbutil.run_to_source_breakpoint(self, "Foo{}", lldb.SBFileSpec("main.cpp"))
13+
14+
self.expect("expr -l c++11 -- Foo{} <=> Foo{}", error=True, substrs=["'<=>' is a single token in C++20; add a space to avoid a change in behavior"])
15+
16+
self.expect("expr -l c++20 -- Foo{} <=> Foo{}", substrs=["(bool) $0 = true"])
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <compare>
2+
3+
struct Foo {
4+
friend auto operator<=>(Foo const &, Foo const &) { return true; }
5+
};
6+
7+
int main() { return Foo{} <=> Foo{}; }

lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,11 @@ TEST(CPlusPlusLanguage, MethodNameParsing) {
181181

182182
{"auto Foo[abi:abc]<int>::operator<<<Foo[abi:abc]<int>>(int) &",
183183
"Foo[abi:abc]<int>", "operator<<<Foo[abi:abc]<int>>", "(int)", "&",
184-
"Foo[abi:abc]<int>::operator<<<Foo[abi:abc]<int>>"}};
184+
"Foo[abi:abc]<int>::operator<<<Foo[abi:abc]<int>>"},
185+
186+
{"auto A::operator<=>[abi:tag]<A::B>()", "A",
187+
"operator<=>[abi:tag]<A::B>", "()", "",
188+
"A::operator<=>[abi:tag]<A::B>"}};
185189

186190
for (const auto &test : test_cases) {
187191
CPlusPlusLanguage::MethodName method(ConstString(test.input));
@@ -202,7 +206,6 @@ TEST(CPlusPlusLanguage, InvalidMethodNameParsing) {
202206
std::string test_cases[] = {
203207
"int Foo::operator[]<[10>()",
204208
"Foo::operator bool[10]()",
205-
"auto A::operator<=>[abi:tag]<A::B>()",
206209
"auto A::operator<<<(int)",
207210
"auto A::operator>>>(int)",
208211
"auto A::operator<<<Type[abi:tag]<>(int)",
@@ -331,10 +334,9 @@ TEST(CPlusPlusLanguage, ExtractContextAndIdentifier) {
331334
EXPECT_FALSE(CPlusPlusLanguage::ExtractContextAndIdentifier(
332335
"f<A<B><C>>", context, basename));
333336

334-
// We expect these cases to fail until we turn on C++2a
335-
EXPECT_FALSE(CPlusPlusLanguage::ExtractContextAndIdentifier(
337+
EXPECT_TRUE(CPlusPlusLanguage::ExtractContextAndIdentifier(
336338
"A::operator<=><A::B>", context, basename));
337-
EXPECT_FALSE(CPlusPlusLanguage::ExtractContextAndIdentifier(
339+
EXPECT_TRUE(CPlusPlusLanguage::ExtractContextAndIdentifier(
338340
"operator<=><A::B>", context, basename));
339341
}
340342

0 commit comments

Comments
 (0)