fix merge

Author: hekota

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -546,7 +546,7 @@ static void initializeBufferFromBinding(CodeGenModule &CGM,
   auto *Space =
       llvm::ConstantInt::get(CGM.IntTy, RBA ? RBA->getSpaceNumber() : 0);
 
-  if (!RBA->isImplicit()) {
+  if (RBA->hasRegisterSlot()) {
     auto *RegSlot = llvm::ConstantInt::get(CGM.IntTy, RBA->getSlotNumber());
     Intrinsic::ID Intr =
         CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic();

clang/lib/Sema/SemaHLSL.cpp

@@ -559,7 +559,7 @@ void SemaHLSL::ActOnFinishBuffer(Decl *Dcl, SourceLocation RBrace) {
   createHostLayoutStructForBuffer(SemaRef, BufDecl);
 
   HLSLResourceBindingAttr *RBA = Dcl->getAttr<HLSLResourceBindingAttr>();
-  if (!RBA || RBA->isImplicit()) {
+  if (!RBA || !RBA->hasRegisterSlot()) {
     SemaRef.Diag(Dcl->getLocation(), diag::warn_hlsl_implicit_binding);
     // Use HLSLResourceBindingAttr to transfer implicit binding order_ID
     // to codegen. If it does not exist, create an implicit attribute.