Skip to content

Avoid adding types to default namespace #6700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Avoid adding types to default namespace #6700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
100d6a2
Avoid adding types to default namespace
s-perron Jun 18, 2024
b30c138
Remove assert that is no longer true.
s-perron Jun 20, 2024
25dcbdb
Make new test a sema test.
s-perron Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions tools/clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3817,29 +3817,41 @@ class HLSLExternalSource : public ExternalSemaSource {
recordDecl = m_ThreadNodeOutputRecordsTemplateDecl->getTemplatedDecl();
}
#ifdef ENABLE_SPIRV_CODEGEN
else if (kind == AR_OBJECT_VK_SPIRV_TYPE && m_vkNSDecl) {
else if (kind == AR_OBJECT_VK_SPIRV_TYPE) {
if (!m_vkNSDecl)
continue;
recordDecl =
DeclareInlineSpirvType(*m_context, m_vkNSDecl, typeName, false);
recordDecl->setImplicit(true);
} else if (kind == AR_OBJECT_VK_SPIRV_OPAQUE_TYPE && m_vkNSDecl) {
} else if (kind == AR_OBJECT_VK_SPIRV_OPAQUE_TYPE) {
if (!m_vkNSDecl)
continue;
recordDecl =
DeclareInlineSpirvType(*m_context, m_vkNSDecl, typeName, true);
recordDecl->setImplicit(true);
} else if (kind == AR_OBJECT_VK_INTEGRAL_CONSTANT && m_vkNSDecl) {
} else if (kind == AR_OBJECT_VK_INTEGRAL_CONSTANT) {
if (!m_vkNSDecl)
continue;
recordDecl =
DeclareVkIntegralConstant(*m_context, m_vkNSDecl, typeName,
&m_vkIntegralConstantTemplateDecl);
recordDecl->setImplicit(true);
} else if (kind == AR_OBJECT_VK_LITERAL && m_vkNSDecl) {
} else if (kind == AR_OBJECT_VK_LITERAL) {
if (!m_vkNSDecl)
continue;
recordDecl = DeclareTemplateTypeWithHandleInDeclContext(
*m_context, m_vkNSDecl, typeName, 1, nullptr);
recordDecl->setImplicit(true);
m_vkLiteralTemplateDecl = recordDecl->getDescribedClassTemplate();
} else if (kind == AR_OBJECT_VK_SPV_INTRINSIC_TYPE && m_vkNSDecl) {
} else if (kind == AR_OBJECT_VK_SPV_INTRINSIC_TYPE) {
if (!m_vkNSDecl)
continue;
recordDecl = DeclareUIntTemplatedTypeWithHandleInDeclContext(
*m_context, m_vkNSDecl, typeName, "id");
recordDecl->setImplicit(true);
} else if (kind == AR_OBJECT_VK_SPV_INTRINSIC_RESULT_ID && m_vkNSDecl) {
} else if (kind == AR_OBJECT_VK_SPV_INTRINSIC_RESULT_ID) {
if (!m_vkNSDecl)
continue;
recordDecl = DeclareTemplateTypeWithHandleInDeclContext(
*m_context, m_vkNSDecl, typeName, 1, nullptr);
recordDecl->setImplicit(true);
Expand Down Expand Up @@ -4505,8 +4517,6 @@ class HLSLExternalSource : public ExternalSemaSource {
int startDepth = (templateArgCount == 0) ? 0 : 1;
CXXRecordDecl *recordDecl = m_objectTypeDecls[i];
if (recordDecl == nullptr) {
DXASSERT(kind == AR_OBJECT_WAVE,
"else objects other than reserved not initialized");
continue;
}

Expand Down
12 changes: 12 additions & 0 deletions tools/clang/test/SemaHLSL/vk.types.in.dxil.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// RUN: %dxc -T ps_6_0 -E PSMain -fcgl %s -verify

static const integral_constant MyVar; // expected-error{{unknown type name 'integral_constant'}}
static const SpirvType MyVar; // expected-error{{unknown type name 'SpirvType'}}
static const SpirvOpaqueType MyVar; // expected-error{{unknown type name 'SpirvOpaqueType'}}
static const Literal MyVar; // expected-error{{unknown type name 'Literal'}}

float4 PSMain() : SV_TARGET
{
return float4(1.0, 1.0, 1.0, 1.0);
}