Fix static member call instantiation (microsoft#7377)

The first parameter of the HLSL_INTRINSIC record is actually a dummy entry for the function name. When builtin member function templates are instantiated, the 'this' ptr is added as the first ParamVarDecl, which has the same index as the first argument in the HLSL_INTRINSIC record. This shifts the parameter names by one for static member functions, as those do not have a 'this' pointer, as in: ``` | | | `-CXXMethodDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> used MakeMiss 'dx::HitObject (unsigned int, unsigned int, RayDesc)' static | | | |-TemplateArgument type 'dx::HitObject' | | | |-TemplateArgument type 'unsigned int' | | | |-TemplateArgument type 'unsigned int' | | | |-TemplateArgument type 'RayDesc' | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MakeMiss 'unsigned int' | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> RayFlags 'unsigned int' | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MissShaderIndex 'RayDesc' ``` The fix is the take the first actual parameter name of the HLSL_INTRINSIC if a static member function template is declared. Closes microsoft#7374

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -5945,6 +5945,8 @@ class HLSLExternalSource : public ExternalSemaSource {
  "otherwise caller didn't initialize - there should be at least a "
  "void return type");
 
+ const bool IsStatic = IsStaticMember(intrinsic);
+
  // Create the template arguments.
  SmallVector<TemplateArgument, g_MaxIntrinsicParamCount + 1> templateArgs;
  for (size_t i = 0; i < parameterTypeCount; i++) {
@@ -6010,15 +6012,19 @@ class HLSLExternalSource : public ExternalSemaSource {
 
  SmallVector<ParmVarDecl *, g_MaxIntrinsicParamCount> Params;
  for (unsigned int i = 1; i < parameterTypeCount; i++) {
+ // The first parameter in the HLSL intrinsic record is just the intrinsic
+ // name and aliases with the 'this' pointer for non-static members. Skip
+ // this first parameter for static functions.
+ unsigned ParamIdx = IsStatic ? i : i - 1;
  IdentifierInfo *id =
- &m_context->Idents.get(StringRef(intrinsic->pArgs[i - 1].pName));
+ &m_context->Idents.get(StringRef(intrinsic->pArgs[ParamIdx].pName));
  ParmVarDecl *paramDecl = ParmVarDecl::Create(
  *m_context, nullptr, NoLoc, NoLoc, id, parameterTypes[i], nullptr,
  StorageClass::SC_None, nullptr, paramMods[i - 1]);
  Params.push_back(paramDecl);
  }
 
- StorageClass SC = IsStaticMember(intrinsic) ? SC_Static : SC_Extern;
+ StorageClass SC = IsStatic ? SC_Static : SC_Extern;
  QualType T = TInfo->getType();
  DeclarationNameInfo NameInfo(FunctionTemplate->getDeclName(), NoLoc);
  CXXMethodDecl *method = CXXMethodDecl::Create(

tools/clang/test/CodeGenDXIL/hlsl/objects/HitObject/hitobject_make.hlsl

@@ -25,9 +25,9 @@
 // AST-NEXT: | | | |-TemplateArgument type 'unsigned int'
 // AST-NEXT: | | | |-TemplateArgument type 'unsigned int'
 // AST-NEXT: | | | |-TemplateArgument type 'RayDesc'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MakeMiss 'unsigned int'
 // AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> RayFlags 'unsigned int'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MissShaderIndex 'RayDesc'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MissShaderIndex 'unsigned int'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Ray 'RayDesc'
 // AST-NEXT: | | | |-HLSLIntrinsicAttr {{[^ ]+}} <<invalid sloc>> Implicit "op" "" 387
 // AST-NEXT: | | | `-AvailabilityAttr {{[^ ]+}} <<invalid sloc>> Implicit 6.9 0 0 ""
 

tools/clang/test/CodeGenDXIL/hlsl/objects/HitObject/hitobject_traceinvoke.hlsl

@@ -13,8 +13,8 @@
 // AST-NEXT: | | | |-TemplateArgument type 'void'
 // AST-NEXT: | | | |-TemplateArgument type 'dx::HitObject':'dx::HitObject'
 // AST-NEXT: | | | |-TemplateArgument type 'Payload'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Invoke 'dx::HitObject':'dx::HitObject'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> ho 'Payload &&__restrict'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> ho 'dx::HitObject':'dx::HitObject'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Payload 'Payload &&__restrict'
 // AST-NEXT: | | | |-HLSLIntrinsicAttr {{[^ ]+}} <<invalid sloc>> Implicit "op" "" 382
 // AST-NEXT: | | | `-AvailabilityAttr {{[^ ]+}} <<invalid sloc>> Implicit 6.9 0 0 ""
 
@@ -47,14 +47,14 @@
 // AST-NEXT: | | | |-TemplateArgument type 'unsigned int'
 // AST-NEXT: | | | |-TemplateArgument type 'RayDesc'
 // AST-NEXT: | | | |-TemplateArgument type 'Payload'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> TraceRay 'RaytracingAccelerationStructure'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> AccelerationStructure 'unsigned int'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> AccelerationStructure 'RaytracingAccelerationStructure'
 // AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> RayFlags 'unsigned int'
 // AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> InstanceInclusionMask 'unsigned int'
 // AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> RayContributionToHitGroupIndex 'unsigned int'
 // AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MultiplierForGeometryContributionToHitGroupIndex 'unsigned int'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MissShaderIndex 'RayDesc'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Ray 'Payload &&__restrict'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> MissShaderIndex 'unsigned int'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Ray 'RayDesc'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Payload 'Payload &&__restrict'
 // AST-NEXT: | | | |-HLSLIntrinsicAttr {{[^ ]+}} <<invalid sloc>> Implicit "op" "" 389
 // AST-NEXT: | | | `-AvailabilityAttr {{[^ ]+}} <<invalid sloc>> Implicit 6.9 0 0 ""
 

tools/clang/test/SemaHLSL/hlsl/objects/HitObject/hitobject_fromrayquery.hlsl

@@ -9,7 +9,7 @@
 // AST-NEXT: | | | `-CXXMethodDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> used FromRayQuery 'dx::HitObject (RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>)' static
 // AST-NEXT: | | | |-TemplateArgument type 'dx::HitObject'
 // AST-NEXT: | | | |-TemplateArgument type 'RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>':'RayQuery<5, 0>'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> FromRayQuery 'RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>':'RayQuery<5, 0>'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> rq 'RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>':'RayQuery<5, 0>'
 // AST-NEXT: | | | |-HLSLIntrinsicAttr {{[^ ]+}} <<invalid sloc>> Implicit "op" "" 363
 // AST-NEXT: | | | `-AvailabilityAttr {{[^ ]+}} <<invalid sloc>> Implicit 6.9 0 0 ""
 
@@ -27,9 +27,9 @@
 // AST-NEXT: | | | |-TemplateArgument type 'RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>':'RayQuery<5, 0>'
 // AST-NEXT: | | | |-TemplateArgument type 'unsigned int'
 // AST-NEXT: | | | |-TemplateArgument type 'CustomAttrs'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> FromRayQuery 'RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>':'RayQuery<5, 0>'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> rq 'unsigned int'
-// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> HitKind 'CustomAttrs'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> rq 'RayQuery<RAY_FLAG_FORCE_OPAQUE | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH>':'RayQuery<5, 0>'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> HitKind 'unsigned int'
+// AST-NEXT: | | | |-ParmVarDecl {{[^ ]+}} <<invalid sloc>> <invalid sloc> Attributes 'CustomAttrs'
 // AST-NEXT: | | | |-HLSLIntrinsicAttr {{[^ ]+}} <<invalid sloc>> Implicit "op" "" 363
 // AST-NEXT: | | | `-AvailabilityAttr {{[^ ]+}} <<invalid sloc>> Implicit 6.9 0 0 ""