[OpenMP] Diagnose undeclared variables on declare target clause

kkwli · kkwli · commit 59e3d198136d · 2017-11-30T18:52:06.000Z
Clang asserts on undeclared variables on the to or link clause in the declare target directive. The patch is to properly diagnose the error. // foo1 and foo2 are not declared #pragma omp declare target to(foo1) #pragma omp declare target link(foo2) Differential Revision: https://reviews.llvm.org/D40588 llvm-svn: 319458
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
@@ -1506,7 +1506,7 @@ class VarOrFuncDeclFilterCCC : public CorrectionCandidateCallback {
   explicit VarOrFuncDeclFilterCCC(Sema &S) : SemaRef(S) {}
   bool ValidateCandidate(const TypoCorrection &Candidate) override {
     NamedDecl *ND = Candidate.getCorrectionDecl();
-    if (isa<VarDecl>(ND) || isa<FunctionDecl>(ND)) {
+    if (ND && (isa<VarDecl>(ND) || isa<FunctionDecl>(ND))) {
       return SemaRef.isDeclInScope(ND, SemaRef.getCurLexicalContext(),
                                    SemaRef.getCurScope());
     }
diff --git a/clang/test/OpenMP/declare_target_messages.cpp b/clang/test/OpenMP/declare_target_messages.cpp
@@ -13,6 +13,10 @@ void f();
 
 #pragma omp declare target map(a) // expected-error {{unexpected 'map' clause, only 'to' or 'link' clauses expected}}
 
+#pragma omp declare target to(foo1) // expected-error {{use of undeclared identifier 'foo1'}}
+
+#pragma omp declare target link(foo2) // expected-error {{use of undeclared identifier 'foo2'}}
+
 void c(); // expected-warning {{declaration is not declared in any declare target region}}
 
 extern int b;

Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,7 @@ class VarOrFuncDeclFilterCCC : public CorrectionCandidateCallback {`
`1506`	`1506`	`explicit VarOrFuncDeclFilterCCC(Sema &S) : SemaRef(S) {}`
`1507`	`1507`	`bool ValidateCandidate(const TypoCorrection &Candidate) override {`
`1508`	`1508`	`NamedDecl *ND = Candidate.getCorrectionDecl();`
`1509`		`- if (isa<VarDecl>(ND) \|\| isa<FunctionDecl>(ND)) {`
	`1509`	`+ if (ND && (isa<VarDecl>(ND) \|\| isa<FunctionDecl>(ND))) {`
`1510`	`1510`	`return SemaRef.isDeclInScope(ND, SemaRef.getCurLexicalContext(),`
`1511`	`1511`	`SemaRef.getCurScope());`
`1512`	`1512`	`}`