diff options
author | oToToT <ty1208chiang@gmail.com> | 2021-04-07 20:58:48 +0800 |
---|---|---|
committer | oToToT <ty1208chiang@gmail.com> | 2021-04-07 20:58:48 +0800 |
commit | fc1117df5b875b922ec4d4417404b26abaceaf7b (patch) | |
tree | f8c434b903ed8be3a567e7548345e89b8dfb036a /clang/lib/Frontend/CompilerInstance.cpp | |
parent | 0333ed8e0c3763e50ec0c43e289967d407c14786 (diff) | |
download | llvm-fc1117df5b875b922ec4d4417404b26abaceaf7b.zip llvm-fc1117df5b875b922ec4d4417404b26abaceaf7b.tar.gz llvm-fc1117df5b875b922ec4d4417404b26abaceaf7b.tar.bz2 |
[clang] Check AuxTarget exists when creating target in CompilerInstance
D97493 separate target creation out to a single function
`CompilerInstance::createTarget`. However, it would overwrite AuxTarget
even if it has been set.
As @kadircet recommended in D98128, this patch check the existence of
AuxTarget and not overwrite it when it has been set.
Reviewed By: kadircet
Differential Revision: https://reviews.llvm.org/D100024
Diffstat (limited to 'clang/lib/Frontend/CompilerInstance.cpp')
-rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index b2ec18d..b76baae 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -104,8 +104,10 @@ bool CompilerInstance::createTarget() { if (!hasTarget()) return false; - // Create TargetInfo for the other side of CUDA/OpenMP/SYCL compilation. - if ((getLangOpts().CUDA || getLangOpts().OpenMPIsDevice || + // Check whether AuxTarget exists, if not, then create TargetInfo for the + // other side of CUDA/OpenMP/SYCL compilation. + if (!getAuxTarget() && + (getLangOpts().CUDA || getLangOpts().OpenMPIsDevice || getLangOpts().SYCLIsDevice) && !getFrontendOpts().AuxTriple.empty()) { auto TO = std::make_shared<TargetOptions>(); |