From 9c17d254b444eae644d416e1f36bfd0d3d088eae Mon Sep 17 00:00:00 2001
From: Junwhan Ahn <junwhan@google.com>
Date: Fri, 3 Apr 2026 12:44:07 -0700
Subject: [PATCH] Automated Code Change

PiperOrigin-RevId: 894206818
---
 xla/python/pjrt_ifrt/basic_string_array_test.cc      | 11 +++++++----
 xla/python/pjrt_ifrt/xla_executable_impl_test_lib.cc |  7 +++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/xla/python/pjrt_ifrt/basic_string_array_test.cc b/xla/python/pjrt_ifrt/basic_string_array_test.cc
index 777f119d03460..48181fa51ddac 100644
--- a/xla/python/pjrt_ifrt/basic_string_array_test.cc
+++ b/xla/python/pjrt_ifrt/basic_string_array_test.cc
@@ -294,7 +294,7 @@ TEST(MakeArrayFromHostBufferTest, SuccessCase) {
   TF_ASSERT_OK(client->MakeArrayFromHostBuffer(
       data, DType(DType::kString), shape,
       /*byte_strides=*/std::nullopt, std::move(sharding),
-      Client::HostBufferSemantics::kImmutableOnlyDuringCall,
+      /*layout=*/nullptr, Client::HostBufferSemantics::kImmutableOnlyDuringCall,
       std::move(on_done_with_host_buffer)));
 }
 
@@ -317,6 +317,7 @@ TEST(MakeArrayFromHostBufferTest, FailureCases) {
           data, DType(DType::kString), shape,
           /*byte_strides=*/std::optional<absl::Span<const int64_t>>({8}),
           single_device_sharding,
+          /*layout=*/nullptr,
           Client::HostBufferSemantics::kImmutableOnlyDuringCall,
           on_done_with_host_buffer),
       absl_testing::StatusIs(absl::StatusCode::kInvalidArgument));
@@ -330,6 +331,7 @@ TEST(MakeArrayFromHostBufferTest, FailureCases) {
   EXPECT_THAT(client->MakeArrayFromHostBuffer(
                   data, DType(DType::kString), shape,
                   /*byte_strides=*/std::nullopt, opaque_sharding,
+                  /*layout=*/nullptr,
                   Client::HostBufferSemantics::kImmutableOnlyDuringCall,
                   on_done_with_host_buffer),
               absl_testing::StatusIs(absl::StatusCode::kInvalidArgument));
@@ -344,7 +346,8 @@ TEST(MakeArrayFromHostBufferTest, FailureCases) {
     EXPECT_THAT(client->MakeArrayFromHostBuffer(
                     data, DType(DType::kString), shape,
                     /*byte_strides=*/std::nullopt, single_device_sharding,
-                    host_buffer_semantics, on_done_with_host_buffer),
+                    /*layout=*/nullptr, host_buffer_semantics,
+                    on_done_with_host_buffer),
                 absl_testing::StatusIs(absl::StatusCode::kInvalidArgument));
   }
 }
@@ -367,7 +370,7 @@ absl::StatusOr<ArrayRef> MakeSingleDeviceStringTestArray(
   return client->MakeArrayFromHostBuffer(
       data, DType(DType::kString), shape,
       /*byte_strides=*/std::nullopt, std::move(sharding),
-      Client::HostBufferSemantics::kImmutableOnlyDuringCall,
+      /*layout=*/nullptr, Client::HostBufferSemantics::kImmutableOnlyDuringCall,
       std::move(on_done_with_host_buffer));
 }
 
@@ -384,7 +387,7 @@ absl::StatusOr<ArrayRef> MakeSingleDeviceFloatTestArray(Client* client,
   return client->MakeArrayFromHostBuffer(
       data->data(), dtype, shape,
       /*byte_strides=*/std::nullopt, sharding,
-      Client::HostBufferSemantics::kImmutableOnlyDuringCall,
+      /*layout=*/nullptr, Client::HostBufferSemantics::kImmutableOnlyDuringCall,
       /*on_done_with_host_buffer=*/nullptr);
 }
 
diff --git a/xla/python/pjrt_ifrt/xla_executable_impl_test_lib.cc b/xla/python/pjrt_ifrt/xla_executable_impl_test_lib.cc
index 996b6783accf4..3fa3533d3c1f4 100644
--- a/xla/python/pjrt_ifrt/xla_executable_impl_test_lib.cc
+++ b/xla/python/pjrt_ifrt/xla_executable_impl_test_lib.cc
@@ -359,6 +359,7 @@ TEST_P(LoadedExecutableImplTest, CompileAndExecute) {
       auto array, client->MakeArrayFromHostBuffer(
                       data.data(), dtype, shape,
                       /*byte_strides=*/std::nullopt, sharding,
+                      /*layout=*/nullptr,
                       Client::HostBufferSemantics::kImmutableOnlyDuringCall,
                       /*on_done_with_host_buffer=*/{}));
 
@@ -475,6 +476,7 @@ TEST_P(LoadedExecutableImplTest, CancelExecution) {
       auto array, client->MakeArrayFromHostBuffer(
                       data.data(), dtype, shape,
                       /*byte_strides=*/std::nullopt, sharding,
+                      /*layout=*/nullptr,
                       Client::HostBufferSemantics::kImmutableOnlyDuringCall,
                       /*on_done_with_host_buffer=*/{}));
 
@@ -530,6 +532,7 @@ TEST_P(LoadedExecutableImplTest, DoNotFillStatus) {
       auto array, client->MakeArrayFromHostBuffer(
                       data.data(), dtype, shape,
                       /*byte_strides=*/std::nullopt, sharding,
+                      /*layout=*/nullptr,
                       Client::HostBufferSemantics::kImmutableOnlyDuringCall,
                       /*on_done_with_host_buffer=*/{}));
 
@@ -620,6 +623,7 @@ module @add_sub {
           client->MakeArrayFromHostBuffer(
               data.data(), DType(DType::kS32), Shape({2, 3}),
               /*byte_strides=*/std::nullopt, sharding,
+              /*layout=*/nullptr,
               Client::HostBufferSemantics::kImmutableOnlyDuringCall,
               /*on_done_with_host_buffer=*/{}));
     }
@@ -910,6 +914,7 @@ TEST(ExecutableTest, ExecutableSerialization) {
       client->MakeArrayFromHostBuffer(
           data.data(), dtype, shard_shape,
           /*byte_strides=*/std::nullopt, shard_sharding0,
+          /*layout=*/nullptr,
           xla::ifrt::Client::HostBufferSemantics::kImmutableOnlyDuringCall,
           /*on_done_with_host_buffer=*/{}));
   TF_ASSERT_OK_AND_ASSIGN(
@@ -917,6 +922,7 @@ TEST(ExecutableTest, ExecutableSerialization) {
       client->MakeArrayFromHostBuffer(
           data.data() + 3, dtype, shard_shape,
           /*byte_strides=*/std::nullopt, shard_sharding1,
+          /*layout=*/nullptr,
           xla::ifrt::Client::HostBufferSemantics::kImmutableOnlyDuringCall,
           /*on_done_with_host_buffer=*/{}));
   std::vector<xla::ifrt::ArrayRef> shards = {array_shard0, array_shard1};
@@ -937,6 +943,7 @@ TEST(ExecutableTest, ExecutableSerialization) {
       client->MakeArrayFromHostBuffer(
           data.data(), dtype, shape,
           /*byte_strides=*/std::nullopt, input2_sharding,
+          /*layout=*/nullptr,
           xla::ifrt::Client::HostBufferSemantics::kImmutableOnlyDuringCall,
           /*on_done_with_host_buffer=*/nullptr));