Skip to content

Commit 8cb7574

Browse files
committed
Revert "[lldb] Enable C++14 when evaluating expressions in a C++14 frame"
This reverts commit 5f88f39. It broke these three tests on the Window bot: lldb-api :: commands/expression/completion/TestExprCompletion.py lldb-api :: lang/cpp/scope/TestCppScope.py lldb-api :: lang/cpp/standards/cpp11/TestCPP11Standard.py
1 parent a4b8ee6 commit 8cb7574

File tree

7 files changed

+1
-55
lines changed

7 files changed

+1
-55
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,9 @@ ClangExpressionParser::ClangExpressionParser(
491491
// be re-evaluated in the future.
492492
lang_opts.CPlusPlus11 = true;
493493
break;
494-
case lldb::eLanguageTypeC_plus_plus_14:
495-
lang_opts.CPlusPlus14 = true;
496-
LLVM_FALLTHROUGH;
497494
case lldb::eLanguageTypeC_plus_plus:
498495
case lldb::eLanguageTypeC_plus_plus_11:
496+
case lldb::eLanguageTypeC_plus_plus_14:
499497
lang_opts.CPlusPlus11 = true;
500498
m_compiler->getHeaderSearchOpts().UseLibcxx = true;
501499
LLVM_FALLTHROUGH;

lldb/test/API/lang/cpp/standards/cpp11/Makefile

Lines changed: 0 additions & 4 deletions
This file was deleted.

lldb/test/API/lang/cpp/standards/cpp11/TestCPP11Standard.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

lldb/test/API/lang/cpp/standards/cpp11/main.cpp

Lines changed: 0 additions & 3 deletions
This file was deleted.

lldb/test/API/lang/cpp/standards/cpp14/Makefile

Lines changed: 0 additions & 4 deletions
This file was deleted.

lldb/test/API/lang/cpp/standards/cpp14/TestCPP14Standard.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

lldb/test/API/lang/cpp/standards/cpp14/main.cpp

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)