From 8c2b52b8fea02ceb2d6cdb72390e6db14d9b396f Mon Sep 17 00:00:00 2001
From: Zhanyong Wan <wan@google.com>
Date: Fri, 30 May 2025 00:30:56 +0000
Subject: [PATCH] Convert some XLA_CHECKs to fatal errors.

---
 torch_xla/csrc/ops/dynamic_ir.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/torch_xla/csrc/ops/dynamic_ir.h b/torch_xla/csrc/ops/dynamic_ir.h
index 760138eddffe..4d97f4420b3f 100644
--- a/torch_xla/csrc/ops/dynamic_ir.h
+++ b/torch_xla/csrc/ops/dynamic_ir.h
@@ -229,11 +229,19 @@ class SizeError : public XlaNode, public torch::lazy::DimensionNode {
   SizeError();
   int64_t getDynamicValue() const override;
   int64_t getStaticValue() const override {
+<<<<<<< HEAD
     ABSL_LOG(FATAL) << "SizeError::getStaticValue() shouldn't be called.";
     return -1;
   }
   bool isSymbolic() const override {
     ABSL_LOG(FATAL) << "SizeError::isSymbolic() shouldn't be called.";
+=======
+    ABSL_LOG(FATAL) << "SizeError shouldn't be called.";
+    return -1;
+  }
+  bool isSymbolic() const override {
+    ABSL_LOG(FATAL) << "SizeError shouldn't be called.";
+>>>>>>> 850bf21e8 (Convert some XLA_CHECKs to fatal errors.)
     return true;
   }
   std::string ToString() const override;