Skip to content

Commit 9322c9f

Browse files
committed
Adjust calls to clang::TargetInfo::CreateTargetInfo (now takes ref vs. ptr)
See llvm/llvm-project#106271
1 parent dcb905b commit 9322c9f

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

lib/Basic/TargetInfo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ void printTripleInfo(const CompilerInvocation &invocation,
148148
clang::DiagnosticsEngine DE{new clang::DiagnosticIDs(),
149149
new clang::DiagnosticOptions(),
150150
new clang::IgnoringDiagConsumer()};
151-
std::shared_ptr<clang::TargetOptions> TO =
152-
std::make_shared<clang::TargetOptions>();
153-
TO->Triple = triple.str();
154-
clang::TargetInfo *TI = clang::TargetInfo::CreateTargetInfo(DE, TO);
151+
152+
clang::TargetOptions targetOpts;
153+
targetOpts.Triple = triple.str();
154+
clang::TargetInfo *TI = clang::TargetInfo::CreateTargetInfo(DE, targetOpts);
155155
out << " \"pointerWidthInBits\": "
156156
<< TI->getPointerWidth(clang::LangAS::Default) << ",\n";
157157
out << " \"pointerWidthInBytes\": "

lib/ClangImporter/ClangImporter.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ ClangImporter::create(ASTContext &ctx,
14141414
if (!swiftTargetClangInvocation)
14151415
return nullptr;
14161416
auto targetInfo = clang::TargetInfo::CreateTargetInfo(
1417-
clangDiags, swiftTargetClangInvocation->TargetOpts);
1417+
clangDiags, swiftTargetClangInvocation->getTargetOpts());
14181418
// Ensure the target info has configured target-specific defines
14191419
std::string defineBuffer;
14201420
llvm::raw_string_ostream predefines(defineBuffer);
@@ -1426,7 +1426,7 @@ ClangImporter::create(ASTContext &ctx,
14261426
} else {
14271427
// Just use the existing Invocation's directly
14281428
importer->Impl.setSwiftTargetInfo(clang::TargetInfo::CreateTargetInfo(
1429-
clangDiags, importer->Impl.Invocation->TargetOpts));
1429+
clangDiags, importer->Impl.Invocation->getTargetOpts()));
14301430
importer->Impl.setSwiftCodeGenOptions(
14311431
new clang::CodeGenOptions(importer->Impl.Invocation->getCodeGenOpts()));
14321432
}
@@ -1445,9 +1445,8 @@ ClangImporter::create(ASTContext &ctx,
14451445
// things here.
14461446

14471447
// Create the target instance.
1448-
instance.setTarget(
1449-
clang::TargetInfo::CreateTargetInfo(clangDiags,
1450-
instance.getInvocation().TargetOpts));
1448+
instance.setTarget(clang::TargetInfo::CreateTargetInfo(
1449+
clangDiags, instance.getInvocation().getTargetOpts()));
14511450
if (!instance.hasTarget())
14521451
return nullptr;
14531452

0 commit comments

Comments
 (0)