alexfh created this revision.
The test being added in this patch used to cause an assertion failure:
/build/./bin/clang -cc1 -internal-isystem /build/lib/clang/5.0.0/include
-nostdsysteminc -verify -fsyntax-only -std=c++11 -Wshadow-all
/src/tools/clang/test/SemaCXX/warn-shadow.cpp
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Exit Code: 134
Command Output (stderr):
------------------------
clang: /src/tools/clang/lib/AST/ASTDiagnostic.cpp:424: void
clang::FormatASTNodeDiagnosticArgument(DiagnosticsEngine::ArgumentKind,
intptr_t, llvm::StringRef, llvm::StringRef,
ArrayRef<DiagnosticsEngine::ArgumentValue>, SmallVectorImpl<char> &, void *,
ArrayRef<intptr_t>): Assertion `isa<NamedDecl>(DC) && "Expected a NamedDecl"'
failed.
Stack dump:
0. Program arguments: /build/./bin/clang -cc1 -internal-isystem
/build/lib/clang/5.0.0/include -nostdsysteminc -verify -fsyntax-only -std=c++11
-Wshadow-all /src/tools/clang/test/SemaCXX/warn-shadow.cpp
1. /src/tools/clang/test/SemaCXX/warn-shadow.cpp:214:23: current parser token
';'
2. /src/tools/clang/test/SemaCXX/warn-shadow.cpp:213:26: parsing function body
'handleLinkageSpec'
3. /src/tools/clang/test/SemaCXX/warn-shadow.cpp:213:26: in compound statement
('{}')
/build/tools/clang/test/SemaCXX/Output/warn-shadow.cpp.script: line 1: 15595
Aborted (core dumped) /build/./bin/clang -cc1 -internal-isystem
/build/lib/clang/5.0.0/include -nostdsysteminc -verify -fsyntax-only -std=c++11
-Wshadow-all /src/tools/clang/test/SemaCXX/warn-shadow.cpp
https://reviews.llvm.org/D33207
Files:
lib/AST/ASTDiagnostic.cpp
test/SemaCXX/warn-shadow.cpp
Index: test/SemaCXX/warn-shadow.cpp
===================================================================
--- test/SemaCXX/warn-shadow.cpp
+++ test/SemaCXX/warn-shadow.cpp
@@ -206,3 +206,10 @@
}
}
+
+extern "C" {
+typedef int externC; // expected-note {{previous declaration is here}}
+}
+void handleLinkageSpec() {
+ typedef void externC; // expected-warning {{declaration shadows a typedef in
linkage specification}}
+}
Index: lib/AST/ASTDiagnostic.cpp
===================================================================
--- lib/AST/ASTDiagnostic.cpp
+++ lib/AST/ASTDiagnostic.cpp
@@ -420,6 +420,8 @@
OS << ConvertTypeToDiagnosticString(Context,
Context.getTypeDeclType(Type),
PrevArgs, QualTypeVals);
+ } else if (const auto *LS = dyn_cast<LinkageSpecDecl>(DC)) {
+ OS << "linkage specification";
} else {
assert(isa<NamedDecl>(DC) && "Expected a NamedDecl");
NamedDecl *ND = cast<NamedDecl>(DC);
Index: test/SemaCXX/warn-shadow.cpp
===================================================================
--- test/SemaCXX/warn-shadow.cpp
+++ test/SemaCXX/warn-shadow.cpp
@@ -206,3 +206,10 @@
}
}
+
+extern "C" {
+typedef int externC; // expected-note {{previous declaration is here}}
+}
+void handleLinkageSpec() {
+ typedef void externC; // expected-warning {{declaration shadows a typedef in linkage specification}}
+}
Index: lib/AST/ASTDiagnostic.cpp
===================================================================
--- lib/AST/ASTDiagnostic.cpp
+++ lib/AST/ASTDiagnostic.cpp
@@ -420,6 +420,8 @@
OS << ConvertTypeToDiagnosticString(Context,
Context.getTypeDeclType(Type),
PrevArgs, QualTypeVals);
+ } else if (const auto *LS = dyn_cast<LinkageSpecDecl>(DC)) {
+ OS << "linkage specification";
} else {
assert(isa<NamedDecl>(DC) && "Expected a NamedDecl");
NamedDecl *ND = cast<NamedDecl>(DC);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
