Merge branch 'sotoc-issue-23' into 'aurora_offloading_prototype'

Fixing issue llvm#23

Closes llvm#23

See merge request NEC-RWTH-Projects/clang!18

Author: manorom

clang/tools/sotoc/src/DeclResolver.cpp

@@ -98,7 +98,7 @@ void DeclResolver::addDecl(clang::Decl *D) {
 
       // This Decl may have other Decls that is depends on.
       // Add Decl if we haven't already
-      findDependDecls(D, UnresolvedDecls);
+      findDependDecls(ResolveDecl, UnresolvedDecls);
     }
     UnresolvedDecls.erase(ResolveDeclIter);
   }
@@ -111,6 +111,7 @@ void DeclResolver::findDependDecls(
   // compile.
   runOwnVisitor(D, [&D, &UnresolvedDecls, this](clang::Decl *Dep) {
     if (!this->AllDecls.count(Dep)) {
+      DEBUGPDECL(Dep, "Found referred decl: ");
       UnresolvedDecls.insert(Dep);
     }
     // Fix for enums. TODO: find a better way to avoid duplicates
@@ -181,6 +182,7 @@ void TypeDeclResolver::runOwnVisitor(clang::Decl *D,
 
 void FunctionDeclResolver::runOwnVisitor(
     clang::Decl *D, std::function<void(clang::Decl *Dep)> Fn) {
+  DEBUGPDECL(D, "Searching for referred decls in function " );
   DiscoverFunctionsInDeclVisitor Visitor(Fn);
   Visitor.TraverseDecl(D);
 }

clang/tools/sotoc/src/TargetCode.cpp

@@ -37,7 +37,7 @@ bool TargetCode::addCodeFragment(std::shared_ptr<TargetCodeFragment> Frag,
     if ((SM.isPointWithin(Frag->getRealRange().getBegin(),
                           F->getRealRange().getBegin(),
                           F->getRealRange().getEnd()) &&
-         Frag->getRealRange().getBegin() != F->getRealRange().getBegin()) ||
+         Frag->getRealRange().getBegin() != F->getRealRange().getBegin()) &&
         SM.isPointWithin(Frag->getRealRange().getEnd(),
                          F->getRealRange().getBegin(),
                          F->getRealRange().getEnd())) {

clang/tools/sotoc/src/Visitors.cpp

@@ -245,23 +245,12 @@ bool FindTargetCodeVisitor::VisitDecl(clang::Decl *D) {
   // search Decl attributes for 'omp declare target' attr
   for (auto &attr : D->attrs()) {
     if (attr->getKind() == clang::attr::OMPDeclareTargetDecl) {
-      auto SystemHeader = getSystemHeaderForDecl(D);
-      if (SystemHeader.hasValue()) {
-        TargetCodeInfo.addHeader(SystemHeader.getValue());
-        return true;
-      }
-
-      auto TCD = std::make_shared<TargetCodeDecl>(D);
-      TargetCodeInfo.addCodeFragment(TCD);
-      DiscoverTypeVisitor.TraverseDecl(D);
+      Functions.addDecl(D);
       if (FD) {
         if (FD->hasBody() && !FD->doesThisDeclarationHaveABody()) {
           FuncDeclWithoutBody.insert(FD->getNameAsString());
         }
       }
-      if (!D->hasBody() || (FD && !FD->doesThisDeclarationHaveABody())) {
-        TCD->NeedsSemicolon = true;
-      }
       return true;
     }
   }

clang/tools/sotoc/test/declare_target/referred_function.c

@@ -1,4 +1,4 @@
-
+// RUN: %sotoc-transform-compile
 typedef char data_t;
 typedef int calc_t;