grpc 1.48.0-x86_64-linux → 1.49.0.pre1-x86_64-linux

data/src/core/lib/iomgr/call_combiner.cc

@@ -38,11 +38,7 @@ constexpr intptr_t kErrorBit = 1;
 
 grpc_error_handle DecodeCancelStateError(gpr_atm cancel_state) {
   if (cancel_state & kErrorBit) {
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
     return internal::StatusGetFromHeapPtr(cancel_state & ~kErrorBit);
-#else
-    return reinterpret_cast<grpc_error_handle>(cancel_state & ~kErrorBit);
-#endif
   }
   return GRPC_ERROR_NONE;
 }
@@ -60,12 +56,7 @@ CallCombiner::CallCombiner() {
 
 CallCombiner::~CallCombiner() {
   if (cancel_state_ & kErrorBit) {
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
     internal::StatusFreeHeapPtr(cancel_state_ & ~kErrorBit);
-#else
-    GRPC_ERROR_UNREF(reinterpret_cast<grpc_error_handle>(
-        cancel_state_ & ~static_cast<gpr_atm>(kErrorBit)));
-#endif
   }
 }
 
@@ -150,11 +141,7 @@ void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error,
       gpr_log(GPR_INFO, "  QUEUING");
     }
     // Queue was not empty, so add closure to queue.
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
     closure->error_data.error = internal::StatusAllocHeapPtr(error);
-#else
-    closure->error_data.error = reinterpret_cast<intptr_t>(error);
-#endif
     queue_.Push(
         reinterpret_cast<MultiProducerSingleConsumerQueue::Node*>(closure));
   }
@@ -189,13 +176,8 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) {
         }
         continue;
       }
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
       grpc_error_handle error =
           internal::StatusMoveFromHeapPtr(closure->error_data.error);
-#else
-      grpc_error_handle error =
-          reinterpret_cast<grpc_error_handle>(closure->error_data.error);
-#endif
       closure->error_data.error = 0;
       if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) {
         gpr_log(GPR_INFO, "  EXECUTING FROM QUEUE: closure=%p error=%s",
@@ -254,21 +236,13 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) {
 
 void CallCombiner::Cancel(grpc_error_handle error) {
   GRPC_STATS_INC_CALL_COMBINER_CANCELLED();
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
   intptr_t status_ptr = internal::StatusAllocHeapPtr(error);
   gpr_atm new_state = kErrorBit | status_ptr;
-#else
-  gpr_atm new_state = kErrorBit | reinterpret_cast<gpr_atm>(error);
-#endif
   while (true) {
     gpr_atm original_state = gpr_atm_acq_load(&cancel_state_);
     grpc_error_handle original_error = DecodeCancelStateError(original_state);
     if (!GRPC_ERROR_IS_NONE(original_error)) {
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
       internal::StatusFreeHeapPtr(status_ptr);
-#else
-      GRPC_ERROR_UNREF(error);
-#endif
       break;
     }
     if (gpr_atm_full_cas(&cancel_state_, original_state, new_state)) {

data/src/core/lib/iomgr/closure.h

@@ -199,11 +199,7 @@ inline bool grpc_closure_list_append(grpc_closure_list* closure_list,
     GRPC_ERROR_UNREF(error);
     return false;
   }
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
   closure->error_data.error = grpc_core::internal::StatusAllocHeapPtr(error);
-#else
-  closure->error_data.error = reinterpret_cast<intptr_t>(error);
-#endif
   return grpc_closure_list_append(closure_list, closure);
 }
 
@@ -212,13 +208,8 @@ inline void grpc_closure_list_fail_all(grpc_closure_list* list,
                                        grpc_error_handle forced_failure) {
   for (grpc_closure* c = list->head; c != nullptr; c = c->next_data.next) {
     if (c->error_data.error == 0) {
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
       c->error_data.error =
           grpc_core::internal::StatusAllocHeapPtr(forced_failure);
-#else
-      c->error_data.error =
-          reinterpret_cast<intptr_t>(GRPC_ERROR_REF(forced_failure));
-#endif
     }
   }
   GRPC_ERROR_UNREF(forced_failure);

data/src/core/lib/iomgr/combiner.cc

@@ -149,11 +149,7 @@ static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* cl,
   }
   GPR_ASSERT(last & STATE_UNORPHANED);  // ensure lock has not been destroyed
   assert(cl->cb);
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
   cl->error_data.error = grpc_core::internal::StatusAllocHeapPtr(error);
-#else
-  cl->error_data.error = reinterpret_cast<intptr_t>(error);
-#endif
   lock->queue.Push(cl->next_data.mpscq_node.get());
 }
 
@@ -228,18 +224,10 @@ bool grpc_combiner_continue_exec_ctx() {
 #ifndef NDEBUG
     cl->scheduled = false;
 #endif
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
     grpc_error_handle cl_err =
         grpc_core::internal::StatusMoveFromHeapPtr(cl->error_data.error);
     cl->error_data.error = 0;
     cl->cb(cl->cb_arg, std::move(cl_err));
-#else
-    grpc_error_handle cl_err =
-        reinterpret_cast<grpc_error_handle>(cl->error_data.error);
-    cl->error_data.error = 0;
-    cl->cb(cl->cb_arg, cl_err);
-    GRPC_ERROR_UNREF(cl_err);
-#endif
   } else {
     grpc_closure* c = lock->final_list.head;
     GPR_ASSERT(c != nullptr);
@@ -252,18 +240,10 @@ bool grpc_combiner_continue_exec_ctx() {
 #ifndef NDEBUG
       c->scheduled = false;
 #endif
-#ifdef GRPC_ERROR_IS_ABSEIL_STATUS
       grpc_error_handle error =
           grpc_core::internal::StatusMoveFromHeapPtr(c->error_data.error);
       c->error_data.error = 0;
       c->cb(c->cb_arg, std::move(error));
-#else
-      grpc_error_handle error =
-          reinterpret_cast<grpc_error_handle>(c->error_data.error);
-      c->error_data.error = 0;
-      c->cb(c->cb_arg, error);
-      GRPC_ERROR_UNREF(error);
-#endif
       c = next;
     }
   }

data/src/core/lib/iomgr/endpoint_pair_posix.cc

@@ -63,7 +63,8 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name,
   const grpc_channel_args* new_args = grpc_core::CoreConfiguration::Get()
                                           .channel_args_preconditioning()
                                           .PreconditionChannelArgs(args)
-                                          .ToC();
+                                          .ToC()
+                                          .release();
   p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name.c_str(), false),
                              new_args, "socketpair-server");
   final_name = absl::StrCat(name, ":server");