summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/InitPreprocessor.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard@metafoo.co.uk>2019-12-19 15:18:59 -0800
committerRichard Smith <richard@metafoo.co.uk>2019-12-19 15:20:10 -0800
commitf4a45c2ce4ce2a7a33d5773048682e65f348a486 (patch)
tree5006bf3f2050e83a5f1cc9996ffce05bac7efcb5 /clang/lib/Frontend/InitPreprocessor.cpp
parentb284005072122fe4af879725e3c8090009f89ca0 (diff)
downloadbcm5719-llvm-f4a45c2ce4ce2a7a33d5773048682e65f348a486.tar.gz
bcm5719-llvm-f4a45c2ce4ce2a7a33d5773048682e65f348a486.zip
Fix crash on init-capture packs where the type of the initializer is non-dependent.
Diffstat (limited to 'clang/lib/Frontend/InitPreprocessor.cpp')
-rw-r--r--clang/lib/Frontend/InitPreprocessor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index 14c9ccd8a66..2c7e3a56c04 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -507,7 +507,8 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts,
if (LangOpts.CPlusPlus14) {
Builder.defineMacro("__cpp_binary_literals", "201304L");
Builder.defineMacro("__cpp_digit_separators", "201309L");
- Builder.defineMacro("__cpp_init_captures", "201304L"); // (not latest)
+ Builder.defineMacro("__cpp_init_captures",
+ LangOpts.CPlusPlus2a ? "201803L" : "201304L");
Builder.defineMacro("__cpp_generic_lambdas",
LangOpts.CPlusPlus2a ? "201707L" : "201304L");
Builder.defineMacro("__cpp_decltype_auto", "201304L");
OpenPOWER on IntegriCloud