[Diag] Avoid emitting a redefinition note if no location is available.

Matt Davis · Matt Davis · commit 9cc6bba52c38 · 2018-03-28T16:05:05.000Z
Summary: The "previous definition is here" note is not helpful if there is no location information. The note will reference nothing in such a case. This patch first checks to see if there is location data, and if so the note diagnostic is emitted. This fixes PR15409. The issue in the first comment seems to already be resolved. This patch addresses the second example. Reviewers: bruno, rsmith Reviewed By: bruno Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D44901 llvm-svn: 328712
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
@@ -4057,7 +4057,8 @@ void Sema::notePreviousDefinition(const NamedDecl *Old, SourceLocation New) {
   }
 
   // Redefinition coming from different files or couldn't do better above.
-  Diag(Old->getLocation(), diag::note_previous_definition);
+  if (Old->getLocation().isValid())
+    Diag(Old->getLocation(), diag::note_previous_definition);
 }
 
 /// We've just determined that \p Old and \p New both appear to be definitions
diff --git a/clang/test/Sema/redefine_extname.c b/clang/test/Sema/redefine_extname.c
@@ -4,3 +4,4 @@
 #pragma redefine_extname foo_static bar_static
 static int foo_static() { return 1; } // expected-warning {{#pragma redefine_extname is applicable to external C declarations only; not applied to function 'foo_static'}}
 
+unsigned __int128_t; // expected-error {{redefinition of '__int128_t' as different kind of symbol}}

Original file line number	Diff line number	Diff line change
`@@ -4057,7 +4057,8 @@ void Sema::notePreviousDefinition(const NamedDecl *Old, SourceLocation New) {`
`4057`	`4057`	`}`
`4058`	`4058`
`4059`	`4059`	`// Redefinition coming from different files or couldn't do better above.`
`4060`		`- Diag(Old->getLocation(), diag::note_previous_definition);`
	`4060`	`+ if (Old->getLocation().isValid())`
	`4061`	`+ Diag(Old->getLocation(), diag::note_previous_definition);`
`4061`	`4062`	`}`
`4062`	`4063`
`4063`	`4064`	`/// We've just determined that \p Old and \p New both appear to be definitions`
Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@`
`4`	`4`	`#pragma redefine_extname foo_static bar_static`
`5`	`5`	`static int foo_static() { return 1; } // expected-warning {{#pragma redefine_extname is applicable to external C declarations only; not applied to function 'foo_static'}}`
`6`	`6`
	`7`	`+unsigned __int128_t; // expected-error {{redefinition of '__int128_t' as different kind of symbol}}`