Merge branch 'main' into update-jax-export

openxla · Nov 4, 2024 · fbe66c9 · fbe66c9
2 parents 46adff2 + fd8ff44
commit fbe66c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -17,9 +17,9 @@ workspace(name = "stablehlo")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "ac4bd74190fedfbe025ef757ff308dd184a507f5"
+LLVM_COMMIT = "95c2d798148f12565dd4c9ddc753d196e47f230f"
 
-LLVM_SHA256 = "5344d79adb0049d8879fabfdac5589d4b770a02312ed8f82ce56cbf043fc86ab"
+LLVM_SHA256 = "f11e5bbf17d50ff31addc9e1737d64e64a144fce928166de5878c72a1efcf9b4"
 
 http_archive(
     name = "llvm-raw",

diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
@@ -1 +1 @@
-ac4bd74190fedfbe025ef757ff308dd184a507f5
+95c2d798148f12565dd4c9ddc753d196e47f230f
diff --git a/stablehlo/dialect/Version.h b/stablehlo/dialect/Version.h
@@ -38,7 +38,7 @@ class Version {
   static FailureOr<Version> fromString(llvm::StringRef versionRef);
 
   /// Return a Version representing the current VHLO dialect version.
-  static Version getCurrentVersion() { return Version(1, 8, 2); }
+  static Version getCurrentVersion() { return Version(1, 8, 3); }
 
   /// Return a Version representing the minimum supported VHLO dialect version.
   static Version getMinimumVersion() { return Version(0, 9, 0); }

diff --git a/stablehlo/transforms/StablehloAggressiveSimplification.cpp b/stablehlo/transforms/StablehloAggressiveSimplification.cpp
@@ -1212,7 +1212,7 @@ struct SortOpSetDimension : public OpRewritePattern<SortOp> {
 
   LogicalResult matchAndRewrite(SortOp op,
                                 PatternRewriter &rewriter) const override {
-    if (op.getResults().size() == 0 ||
+    if (op.getResults().empty() ||
         static_cast<int64_t>(op.getDimension()) != -1)
       return rewriter.notifyMatchFailure(op,
                                          "dimension already set or no results");