[ser] Implement INTRIN_FLAG_STATIC_MEMBER

Author: simoll

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -1852,6 +1852,10 @@ static const char *g_DeprecatedEffectObjectNames[] = {
     "RenderTargetView",  // 16
 };
 
+static bool IsStaticMember(const HLSL_INTRINSIC *fn) {
+  return fn->Flags & INTRIN_FLAG_STATIC_MEMBER;
+}
+
 static bool IsVariadicIntrinsicFunction(const HLSL_INTRINSIC *fn) {
   return fn->pArgs[fn->uNumArgs - 1].uTemplateId == INTRIN_TEMPLATE_VARARGS;
 }
@@ -1992,7 +1996,7 @@ AddHLSLIntrinsicFunction(ASTContext &context, NamespaceDecl *NS,
   std::vector<QualType> fnArgTypes(functionArgQualTypes.begin() + 1,
                                    functionArgQualTypes.end());
 
-  StorageClass SC = pIntrinsic->bStaticMember ? SC_Static : SC_Extern;
+  StorageClass SC = IsStaticMember(pIntrinsic) ? SC_Static : SC_Extern;
   QualType functionType =
       context.getFunctionType(fnReturnType, fnArgTypes, protoInfo, paramMods);
   FunctionDecl *functionDecl = FunctionDecl::Create(
@@ -3194,7 +3198,7 @@ class HLSLExternalSource : public ExternalSemaSource {
         &m_context->Idents.get(StringRef(intrinsic->pArgs[0].pName));
     DeclarationName declarationName = DeclarationName(ii);
 
-    StorageClass SC = intrinsic->bStaticMember ? SC_Static : SC_None;
+    StorageClass SC = IsStaticMember(intrinsic) ? SC_Static : SC_None;
 
     CXXMethodDecl *functionDecl = CreateObjectFunctionDeclarationWithParams(
         *m_context, recordDecl, functionResultQT,
@@ -3595,7 +3599,7 @@ class HLSLExternalSource : public ExternalSemaSource {
       InitParamMods(intrinsic, paramMods);
 
       // Create FunctionDecl.
-      StorageClass SC = intrinsic->bStaticMember ? SC_Static : SC_Extern;
+      StorageClass SC = IsStaticMember(intrinsic) ? SC_Static : SC_Extern;
       QualType fnType = getIntrinsicFunctionType(paramTypes, paramMods);
       TypeSourceInfo *TInfo =
           m_sema->getASTContext().CreateTypeSourceInfo(fnType, 0);
@@ -5958,7 +5962,7 @@ class HLSLExternalSource : public ExternalSemaSource {
       Params.push_back(paramDecl);
     }
 
-    StorageClass SC = intrinsic->bStaticMember ? SC_Static : SC_Extern;
+    StorageClass SC = IsStaticMember(intrinsic) ? SC_Static : SC_Extern;
     QualType T = TInfo->getType();
     DeclarationNameInfo NameInfo(FunctionTemplate->getDeclName(), NoLoc);
     CXXMethodDecl *method = CXXMethodDecl::Create(

utils/hct/hctdb_instrhelp.py

@@ -999,10 +999,9 @@ def get_hlsl_intrinsics():
             flags = " | ".join(flags)
         else:
             flags = "0"
-        ns_table += "    {(UINT)%s::%s_%s, %s, 0x%x, %d, %d, g_%s_Args%s},\n" % (
+        ns_table += "    {(UINT)%s::%s, %s, 0x%x, %d, %d, g_%s_Args%s},\n" % (
             opcode_namespace,
-            id_prefix,
-            i.name,
+            i.enum_name,
             flags,
             i.min_shader_model,
             i.overload_param_index,