[nomp] Print canonical types to expand typedefs

nomp-org · Sep 20, 2023 · a2997e3 · a2997e3
1 parent ade6a17
commit a2997e3
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/clang/lib/Parse/ParseNomp.cpp b/clang/lib/Parse/ParseNomp.cpp
@@ -577,6 +577,7 @@ static void GetExtVarsAndKnl(std::set<VarDecl *> &EV, std::string &KnlStr,
 
   clang::PrintingPolicy Policy(Opts);
   Policy.SuppressInitializers = true;
+  Policy.PrintCanonicalTypes = true;
 
   llvm::raw_string_ostream KnlStream(KnlStr);
   KnlStream << "void " << KnlName << "(";
@@ -592,12 +593,8 @@ static void GetExtVarsAndKnl(std::set<VarDecl *> &EV, std::string &KnlStr,
   }
   KnlStream << " {\n";
 
-  SourceLocation BL = FS->getBeginLoc(), EL = FS->getEndLoc();
-  llvm::StringRef bfr = SM.getBufferData(SM.getFileID(BL));
-  unsigned s = SM.getFileOffset(BL), e = SM.getFileOffset(EL), n = e;
-  for (; n < bfr.size() && bfr[n] != ';' && bfr[n] != '}'; n++)
-    ;
-  KnlStream << std::string(bfr.data() + s, n - s + 2) << "}";
+  FS->printPretty(KnlStream, nullptr, Policy, 0);
+  KnlStream << "}";
 }
 
 static void CreateNompJitCall(llvm::SmallVector<Stmt *, 16> &Stmts,