Skip to content

Commit 99e9ed8

Browse files
authored
Merge pull request #84274 from egorzhdan/egorzhdan/rm-dead-partial-var
[cxx-interop] Remove dead logic in const import
2 parents 6761d84 + fba1f34 commit 99e9ed8

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

lib/ClangImporter/ImportDecl.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4604,15 +4604,11 @@ namespace {
46044604
bool initIsEvaluatable = false;
46054605
if (Impl.SwiftContext.ClangImporterOpts.EnableConstValueImporting) {
46064606
if (auto init = decl->getInit()) {
4607-
// Don't import values for partial specializations. TODO: Should we
4608-
// stop importing partially specialized variables completely?
4609-
bool partial = isa<clang::VarTemplatePartialSpecializationDecl>(decl);
4610-
46114607
// Don't import values when type-dependent or value-dependent.
46124608
bool typeDependent = decl->getType()->isDependentType();
46134609
bool valueDependent = init->isValueDependent();
46144610

4615-
initIsEvaluatable = !partial && !typeDependent && !valueDependent;
4611+
initIsEvaluatable = !typeDependent && !valueDependent;
46164612
}
46174613
}
46184614

0 commit comments

Comments
 (0)