From ffa532d7a1d964230ee7e4eaeb91678c47484325 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Tue, 13 Sep 2016 01:20:40 +0000 Subject: [PATCH] Fix interaction between serialization and c++1z feature. In c++1z, static_assert is not required to have a StringLiteral message, where previously it was required. Update the AST Reader to be able to handle a null StringLiteral. llvm-svn: 281286 --- clang/lib/Serialization/ASTReaderDecl.cpp | 2 +- clang/test/Modules/Inputs/static_assert/a.h | 3 +++ clang/test/Modules/Inputs/static_assert/module.modulemap | 1 + clang/test/Modules/static_assert.cpp | 8 ++++++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 clang/test/Modules/Inputs/static_assert/a.h create mode 100644 clang/test/Modules/Inputs/static_assert/module.modulemap create mode 100644 clang/test/Modules/static_assert.cpp diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index d68d6d3..686c7f2 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -2239,7 +2239,7 @@ void ASTDeclReader::VisitStaticAssertDecl(StaticAssertDecl *D) { VisitDecl(D); D->AssertExprAndFailed.setPointer(Reader.ReadExpr(F)); D->AssertExprAndFailed.setInt(Record[Idx++]); - D->Message = cast(Reader.ReadExpr(F)); + D->Message = cast_or_null(Reader.ReadExpr(F)); D->RParenLoc = ReadSourceLocation(Record, Idx); } diff --git a/clang/test/Modules/Inputs/static_assert/a.h b/clang/test/Modules/Inputs/static_assert/a.h new file mode 100644 index 0000000..e876df0 --- /dev/null +++ b/clang/test/Modules/Inputs/static_assert/a.h @@ -0,0 +1,3 @@ +class S { + static_assert(4 == 4); +}; diff --git a/clang/test/Modules/Inputs/static_assert/module.modulemap b/clang/test/Modules/Inputs/static_assert/module.modulemap new file mode 100644 index 0000000..bb00c84 --- /dev/null +++ b/clang/test/Modules/Inputs/static_assert/module.modulemap @@ -0,0 +1 @@ +module a { header "a.h" } diff --git a/clang/test/Modules/static_assert.cpp b/clang/test/Modules/static_assert.cpp new file mode 100644 index 0000000..d1b7590 --- /dev/null +++ b/clang/test/Modules/static_assert.cpp @@ -0,0 +1,8 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fimplicit-module-maps \ +// RUN: -I%S/Inputs/static_assert -std=c++1z -verify %s +// expected-no-diagnostics + +#include "a.h" + +S s; -- 2.7.4