integral_constant is exposed to the global namespace in DXC (trunk)

[KStocky]

Description
integral_constant is defined in the global namespace in DXC(1.8.2405.17). The primary template appears to be declared as follows:

template<typename T>
struct integral_constant;

I don't think this type should be defined in the global namespace.

Steps to Reproduce

This should not compile: https://godbolt.org/z/hKxdKhW7e.
DXC 1.8.2403 does not compile this code: https://godbolt.org/z/vha9GennT

Environment

• DXC version: 1.8.2405.17
• Host Operating System N/A

[damyanp]

@cassiebeckley - we think that this is the result of something you added recently that should be in the vk namespace.

[KStocky]

Just updating this to say that this bug is now in 1.8.2405.17. It is no longer just an issue with DXC trunk on godbolt

[s-perron]

In the code that adds the builtin types, the pattern used for adding types in the vk namespace is

DirectXShaderCompiler/tools/clang/lib/Sema/SemaHLSL.cpp

Line 3828 in 8c3f40c

} else if (kind == AR_OBJECT_VK_INTEGRAL_CONSTANT && m_vkNSDecl) {

Note that the second condition is to check if the vk namespace has been defined. If not, it continues to the next condition, and eventually falls into the default case, which add the function in the default namespace:

DirectXShaderCompiler/tools/clang/lib/Sema/SemaHLSL.cpp

Lines 3851 to 3862 in 8c3f40c

	} else {
	DXASSERT(templateArgCount == 1 || templateArgCount == 2,
	"otherwise a new case has been added");
	TypeSourceInfo *typeDefault =
	TemplateHasDefaultType(kind) ? float4TypeSourceInfo : nullptr;
	recordDecl = DeclareTemplateTypeWithHandle(
	*m_context, typeName, templateArgCount, typeDefault);
	}
	m_objectTypeDecls[i] = recordDecl;
	m_objectTypeDeclsMap[i] = std::make_pair(recordDecl, i);
	}

We need to change this first condition, so that it continues if the vk namespace is not defined.