cleanup

Author: hekota

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

@@ -175,7 +175,7 @@ struct BuiltinTypeMethodBuilder {
   template <typename TResource, typename TValue>
   BuiltinTypeMethodBuilder &setHandleFieldOnResource(TResource ResourceRecord, TValue HandleValue);
   template <typename T> BuiltinTypeMethodBuilder &returnValue(T ReturnValue);
-  BuiltinTypeDeclBuilder &finalize(CXXMethodDecl **OutMethod = nullptr);
+  BuiltinTypeDeclBuilder &finalize();
   Expr *getResourceHandleExpr();
 
 private:
@@ -576,7 +576,7 @@ BuiltinTypeMethodBuilder &BuiltinTypeMethodBuilder::returnValue(T ReturnValue) {
 }
 
 BuiltinTypeDeclBuilder &
-BuiltinTypeMethodBuilder::finalize(CXXMethodDecl **OutMethod) {
+BuiltinTypeMethodBuilder::finalize() {
   assert(!DeclBuilder.Record->isCompleteDefinition() &&
          "record is already complete");
 
@@ -608,8 +608,6 @@ BuiltinTypeMethodBuilder::finalize(CXXMethodDecl **OutMethod) {
         AST, SourceRange(), AlwaysInlineAttr::CXX11_clang_always_inline));
     DeclBuilder.Record->addDecl(Method);
   }
-  if (OutMethod)
-    *OutMethod = Method;
   return DeclBuilder;
 }
 
@@ -714,7 +712,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addHandleMember(
 
 // Adds default constructor to the resource class:
 // Resource::Resource()
-BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultConstructor() {
+BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
   if (Record->isCompleteDefinition())
     return *this;
 

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h

@@ -25,7 +25,6 @@ namespace clang {
 class ClassTemplateDecl;
 class NamespaceDecl;
 class CXXRecordDecl;
-class CXXConstructorDecl;
 class FieldDecl;
 
 namespace hlsl {
@@ -53,7 +52,6 @@ class BuiltinTypeDeclBuilder {
   ClassTemplateDecl *PrevTemplate = nullptr;
   NamespaceDecl *HLSLNamespace = nullptr;
   llvm::StringMap<FieldDecl *> Fields;
-  CXXConstructorDecl *HandleCtor = nullptr;
 
 public:
   friend struct TemplateParameterListBuilder;
@@ -79,7 +77,7 @@ class BuiltinTypeDeclBuilder {
   BuiltinTypeDeclBuilder &addArraySubscriptOperators();
 
   // Builtin types constructors
-  BuiltinTypeDeclBuilder &addDefaultConstructor();
+  BuiltinTypeDeclBuilder &addDefaultHandleConstructor();
   BuiltinTypeDeclBuilder &addHandleConstructorFromBinding();
   BuiltinTypeDeclBuilder &addHandleConstructorFromImplicitBinding();
 

clang/lib/Sema/HLSLExternalSemaSource.cpp

@@ -131,7 +131,7 @@ static BuiltinTypeDeclBuilder setupBufferType(CXXRecordDecl *Decl, Sema &S,
                                               bool RawBuffer) {
   return BuiltinTypeDeclBuilder(S, Decl)
       .addHandleMember(RC, IsROV, RawBuffer)
-      .addDefaultConstructor()
+      .addDefaultHandleConstructor()
       .addCreateFromBinding()
       .addCreateFromImplicitBinding()
       .addHandleConstructorFromBinding()