Skip to content

Commit cd89c4e

Browse files
jiejanezhangjiejanezhang
committed
Fix compile issues
Fix compile issues
1 parent 6cf9595 commit cd89c4e

File tree

13 files changed

+348
-38
lines changed

13 files changed

+348
-38
lines changed

‎clang/lib/DPCT/AnalysisInfo.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2564,7 +2564,6 @@ void DpctNameGenerator::printName(const FunctionDecl *FD,
25642564
}
25652565
DpctNameGenerator::DpctNameGenerator(ASTContext &Ctx)
25662566
: G(Ctx), PP(Ctx.getPrintingPolicy()) {
2567-
PP.PrintCanonicalTypes = true;
25682567
}
25692568
std::string DpctNameGenerator::getName(const FunctionDecl *D) {
25702569
std::string Result;

‎clang/lib/DPCT/DPCT.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ UnifiedPath getCudaInstallPath(int argc, const char **argv) {
184184
Opts.ParseArgs(Argv, MissingArgIndex, MissingArgCount);
185185

186186
// Create minimalist CudaInstallationDetector and return the InstallPath.
187-
DiagnosticsEngine E(nullptr, nullptr, nullptr, false);
187+
auto DiagOpts = std::make_shared<DiagnosticOptions>();
188+
DiagnosticsEngine E(nullptr, *DiagOpts, nullptr, false);
188189
driver::Driver Driver("", llvm::sys::getDefaultTargetTriple(), E);
189190
driver::CudaInstallationDetector CudaIncludeDetector(
190191
Driver, llvm::Triple(Driver.getTargetTriple()), ParsedArgs);
@@ -243,10 +244,13 @@ unsigned int GetLinesNumber(clang::tooling::RefactoringTool &Tool,
243244
UnifiedPath Path) {
244245
// Set up Rewriter and to get source manager.
245246
LangOptions DefaultLangOptions;
246-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
247-
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), &*DiagOpts);
247+
auto DiagOpts = std::make_shared<DiagnosticOptions>();
248+
249+
250+
251+
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DiagOpts);
248252
DiagnosticsEngine Diagnostics(
249-
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
253+
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), *DiagOpts,
250254
&DiagnosticPrinter, false);
251255
SourceManager Sources(Diagnostics, Tool.getFiles());
252256
Rewriter Rewrite(Sources, DefaultLangOptions);
@@ -679,9 +683,9 @@ int showAPIMapping(StringRef SrcAPI, StringRef Option, RefactoringTool &Tool,
679683
ReplTy &ReplSYCL) {
680684
llvm::outs() << "CUDA API:" << llvm::raw_ostream::GREEN << SrcAPI
681685
<< llvm::raw_ostream::RESET;
686+
auto DiagOpts = std::make_shared<DiagnosticOptions>();
682687
DiagnosticsEngine Diagnostics(
683-
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()),
684-
IntrusiveRefCntPtr<DiagnosticOptions>(new DiagnosticOptions()));
688+
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), *DiagOpts);
685689
SourceManager Sources(Diagnostics, Tool.getFiles());
686690
LangOptions DefaultLangOptions;
687691
Rewriter Rewrite(Sources, DefaultLangOptions);

‎clang/lib/DPCT/Diagnostics/Diagnostics.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,12 @@ class SourceManagerForWarning {
353353

354354
private:
355355
SourceManagerForWarning() {
356-
DiagOpts = new DiagnosticOptions();
356+
357+
DiagOpts = std::make_shared<DiagnosticOptions>();
357358
DiagOpts->ShowColors = DpctGlobalInfo::getInstance().getColorOption();
358-
DiagnosticPrinter = new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts);
359+
DiagnosticPrinter = new TextDiagnosticPrinter(llvm::errs(), *DiagOpts);
359360
Diagnostics = new DiagnosticsEngine(
360-
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
361+
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), *DiagOpts,
361362
DiagnosticPrinter, false);
362363

363364
FSO.WorkingDir = ".";
@@ -367,7 +368,7 @@ class SourceManagerForWarning {
367368
}
368369

369370
LangOptions DefaultLangOptions;
370-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts;
371+
std::shared_ptr<DiagnosticOptions> DiagOpts;
371372
TextDiagnosticPrinter *DiagnosticPrinter;
372373
DiagnosticsEngine *Diagnostics;
373374
FileSystemOptions FSO;

‎clang/lib/DPCT/FileGenerator/GenFiles.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,11 @@ static bool formatFile(const clang::tooling::UnifiedPath &FileName,
111111
// the first input (the original output of dpct without format), then the
112112
// result is wrong.
113113
clang::LangOptions DefaultLangOptions;
114-
IntrusiveRefCntPtr<clang::DiagnosticOptions> DiagOpts =
115-
new clang::DiagnosticOptions();
116-
clang::TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), &*DiagOpts);
114+
auto *DO = new DiagnosticOptions;
115+
clang::TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DO);
117116
clang::DiagnosticsEngine Diagnostics(
118117
IntrusiveRefCntPtr<clang::DiagnosticIDs>(new clang::DiagnosticIDs()),
119-
&*DiagOpts, &DiagnosticPrinter, false);
118+
*DO, &DiagnosticPrinter, false);
120119

121120
clang::FileSystemOptions FSO;
122121
FSO.WorkingDir = ".";
@@ -910,10 +909,10 @@ int saveNewFiles(clang::tooling::RefactoringTool &Tool,
910909
volatile ProcessStatus status = MigrationSucceeded;
911910
// Set up Rewriter.
912911
LangOptions DefaultLangOptions;
913-
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
914-
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), &*DiagOpts);
912+
auto DiagOpts = std::make_shared<DiagnosticOptions>();
913+
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DiagOpts);
915914
DiagnosticsEngine Diagnostics(
916-
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), &*DiagOpts,
915+
IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), *DiagOpts,
917916
&DiagnosticPrinter, false);
918917
SourceManager Sources(Diagnostics, Tool.getFiles());
919918
Rewriter Rewrite(Sources, DefaultLangOptions);

‎clang/lib/DPCT/MigrateScript/GenMakefile.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ static void getCompileInfo(
232232

233233
// Create minimalist CudaInstallationDetector to call the member
234234
// function validateCudaHeaderDirectory()
235-
DiagnosticsEngine E(nullptr, nullptr, nullptr, false);
235+
auto DiagOpts = std::make_shared<DiagnosticOptions>();
236+
DiagnosticsEngine E(nullptr, *DiagOpts, nullptr, false);
236237
clang::driver::Driver Driver("", llvm::sys::getDefaultTargetTriple(),
237238
E);
238239
clang::driver::CudaInstallationDetector CudaIncludeDetector(

‎clang/lib/DPCT/MigrationAction.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,22 +181,24 @@ std::shared_ptr<TranslationUnitInfo> DpctToolAction::createTranslationUnitInfoIm
181181
std::shared_ptr<CompilerInvocation> Invocation, bool &Success) {
182182
Invocation->getDiagnosticOpts().IgnoreWarnings = true;
183183
auto DiagConsumer = new TextDiagnosticPrinter(
184-
DiagnosticStream, &Invocation->getDiagnosticOpts());
184+
DiagnosticStream, Invocation->getDiagnosticOpts());
185185
auto Info = std::make_shared<TranslationUnitInfo>();
186186
FileSystemOptions FO;
187187
FileManager FileMgr(FO);
188188
auto Diags = CompilerInstance::createDiagnostics(
189-
FileMgr.getVirtualFileSystem(), &Invocation->getDiagnosticOpts(),
189+
FileMgr.getVirtualFileSystem(), Invocation->getDiagnosticOpts(),
190190
DiagConsumer,
191191
/*ShouldOwnClient=*/false, &Invocation->getCodeGenOpts());
192192
DpctGlobalInfo::setColorOption(Invocation->getDiagnosticOpts().ShowColors);
193-
Info->AST = ASTUnit::create(Invocation, Diags, CaptureDiagsKind::None, false);
193+
auto DiagOpts = std::make_shared<DiagnosticOptions>();
194+
Info->AST = ASTUnit::create(Invocation, DiagOpts, Diags,
195+
CaptureDiagsKind::None, false);
194196
// Use the FileSystem passed by RefactoringTool.
195197
Info->AST->getFileManager().setVirtualFileSystem(FS);
196198
DpctFrontEndAction FEAction(Info.get());
197199
auto Ret = ASTUnit::LoadFromCompilerInvocationAction(
198-
Invocation, std::make_shared<PCHContainerOperations>(), Diags, &FEAction,
199-
Info->AST.get());
200+
Invocation, std::make_shared<PCHContainerOperations>(), DiagOpts, Diags,
201+
&FEAction, Info->AST.get());
200202
Success = !DiagConsumer->getNumErrors();
201203
if (Ret && (bool)&Info->AST->getASTContext())
202204
return Info;

‎clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,6 @@ void ExprAnalysis::analyzeExpr(const CallExpr *CE) {
10061006

10071007
void ExprAnalysis::analyzeExpr(const CXXMemberCallExpr *CMCE) {
10081008
auto PP = DpctGlobalInfo::getContext().getPrintingPolicy();
1009-
PP.PrintCanonicalTypes = true;
10101009
const auto ME = dyn_cast<MemberExpr>(CMCE->getCallee());
10111010
if (!ME)
10121011
return;
@@ -1177,7 +1176,6 @@ void ExprAnalysis::analyzeType(TypeLoc TL, const Expr *CSCE,
11771176
TyName.clear();
11781177
auto &TSTL = TYPELOC_CAST(TemplateSpecializationTypeLoc);
11791178
auto PP = Context.getPrintingPolicy();
1180-
PP.PrintCanonicalTypes = 1;
11811179
PrintFullTemplateName(OS, PP, TSTL.getTypePtr()->getTemplateName());
11821180
if (!TypeLocRewriterFactoryBase::TypeLocRewriterMap)
11831181
return;

‎clang/lib/DPCT/RulesAsm/AsmMigration.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ class SYCLGen : public SYCLGenBase {
11711171

11721172
auto CommonStr = llvm::Twine(Str)
11731173
.concat("\"")
1174-
.concat(GAS->getAsmString()->getString())
1174+
.concat(GAS->getAsmString())
11751175
.concat("\"")
11761176
.str();
11771177

@@ -1240,7 +1240,7 @@ class SYCLGen : public SYCLGenBase {
12401240

12411241
if (DpctGlobalInfo::useSYCLCompat()) {
12421242
report(Diagnostics::UNSUPPORT_SYCLCOMPAT, /*UseTextBegin=*/true,
1243-
GAS->getAsmString()->getString());
1243+
GAS->getAsmString());
12441244
cutOffMigration();
12451245
return SYCLGenSuccess();
12461246
}
@@ -2431,7 +2431,7 @@ class SYCLGen : public SYCLGenBase {
24312431
bool HandleVset(const InlineAsmInstruction *I, StringRef Fn) {
24322432
if (DpctGlobalInfo::useSYCLCompat()) {
24332433
report(Diagnostics::UNSUPPORT_SYCLCOMPAT, /*UseTextBegin=*/true,
2434-
GAS->getAsmString()->getString());
2434+
GAS->getAsmString());
24352435
cutOffMigration();
24362436
return SYCLGenSuccess();
24372437
}
@@ -3434,7 +3434,7 @@ class SYCLGen : public SYCLGenBase {
34343434
bool HandleCopyWait(const InlineAsmInstruction *Inst) {
34353435
auto CommonStr = llvm::Twine("")
34363436
.concat("\"")
3437-
.concat(GAS->getAsmString()->getString())
3437+
.concat(GAS->getAsmString())
34383438
.concat("\"")
34393439
.str();
34403440

@@ -3467,7 +3467,7 @@ class SYCLGen : public SYCLGenBase {
34673467

34683468
auto CommonStr = llvm::Twine("")
34693469
.concat("\"")
3470-
.concat(GAS->getAsmString()->getString())
3470+
.concat(GAS->getAsmString())
34713471
.concat("\"")
34723472
.str();
34733473

@@ -3694,7 +3694,7 @@ void AsmRule::doMigrateInternel(const GCCAsmStmt *GAS) {
36943694
std::string S = GAS->generateAsmString(C);
36953695
InlineAsmContext Context;
36963696
llvm::SourceMgr Mgr;
3697-
std::string Buffer = GAS->getAsmString()->getString().str();
3697+
std::string Buffer = GAS->getAsmString();
36983698
Mgr.AddNewSourceBuffer(llvm::MemoryBuffer::getMemBuffer(Buffer),
36993699
llvm::SMLoc());
37003700
SYCLIdentiferHandler Handle;

‎clang/lib/DPCT/RulesLang/Math/CallExprRewriterMath.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@ std::optional<std::string> MathSimulatedRewriter::rewrite() {
468468
}
469469
auto &Context = dpct::DpctGlobalInfo::getContext();
470470
auto PP = Context.getPrintingPolicy();
471-
PP.PrintCanonicalTypes = 1;
472471
auto Arg0 = Call->getArg(0);
473472
auto Arg1 = Call->getArg(1);
474473

‎clang/lib/DPCT/RulesLangLib/CallExprRewriterThrust.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ inline std::function<std::string(const CallExpr *)>
129129
makeMappedThrustPolicyEnum(unsigned Idx) {
130130
auto getBaseType = [](QualType QT) -> std::string {
131131
auto PP = DpctGlobalInfo::getContext().getPrintingPolicy();
132-
PP.PrintCanonicalTypes = true;
133132
return QT.getUnqualifiedType().getAsString(PP);
134133
};
135134
auto getMehtodName = [](const ValueDecl *VD) -> std::string {

0 commit comments

Comments
 (0)