[PATCH] D154741: [llvm] Allow SMLoc to be used in constexpr context

[wren romano via Phabricator via llvm-commits]

wrengr created this revision.
wrengr added reviewers: aartbik, bixia, Peiming, yinying-lisa-li, rriddle, mehdi_amini, jpienaar, dcaballe.
Herald added subscribers: bviyer, hanchung, jsetoain, Moerafaat, zero9178, bzcheeseman, sdasgup3, wenzhicui, cota, teijeong, rdzhabarov, tatianashp, msifontes, jurahul, Kayjukh, grosul1, Joonsoo, liufengdb, mgester, arpith-jacob, antiagainst, shauheen.
Herald added a project: All.
wrengr requested review of this revision.
Herald added a reviewer: nicolasvasilache.
Herald added subscribers: llvm-commits, stephenneuendorffer, nicolasvasilache.
Herald added projects: MLIR, LLVM.

Since `StringRef::empty` can be used in constexpr context, it seems reasonable that `SMLoc::isValid` should be too.  The default-ctor and `operator==` are made constexpr for consistency.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D154741

Files:
  llvm/include/llvm/Support/SMLoc.h
  mlir/lib/Dialect/SparseTensor/IR/Detail/Var.h


Index: mlir/lib/Dialect/SparseTensor/IR/Detail/Var.h
===================================================================
--- mlir/lib/Dialect/SparseTensor/IR/Detail/Var.h
+++ mlir/lib/Dialect/SparseTensor/IR/Detail/Var.h
@@ -356,9 +356,9 @@
                     std::optional<Var::Num> n = {})
       : name(name), loc(loc), id(id), num(n), kind(vk) {
     assert(!name.empty() && "null StringRef");
+    assert(loc.isValid() && "null SMLoc");
     assert(isWF(vk) && "unknown VarKind");
     assert((!n || Var::isWF_Num(*n)) && "Var::Num is too large");
-    // NOTE TO Wren: windows did not like loc.isValid constexpr
   }
 
   constexpr StringRef getName() const { return name; }
Index: llvm/include/llvm/Support/SMLoc.h
===================================================================
--- llvm/include/llvm/Support/SMLoc.h
+++ llvm/include/llvm/Support/SMLoc.h
@@ -24,14 +24,14 @@
   const char *Ptr = nullptr;
 
 public:
-  SMLoc() = default;
+  constexpr SMLoc() = default;
 
-  bool isValid() const { return Ptr != nullptr; }
+  constexpr bool isValid() const { return Ptr != nullptr; }
 
-  bool operator==(const SMLoc &RHS) const { return RHS.Ptr == Ptr; }
-  bool operator!=(const SMLoc &RHS) const { return RHS.Ptr != Ptr; }
+  constexpr bool operator==(const SMLoc &RHS) const { return RHS.Ptr == Ptr; }
+  constexpr bool operator!=(const SMLoc &RHS) const { return RHS.Ptr != Ptr; }
 
-  const char *getPointer() const { return Ptr; }
+  constexpr const char *getPointer() const { return Ptr; }
 
   static SMLoc getFromPointer(const char *Ptr) {
     SMLoc L;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D154741.538234.patch
Type: text/x-patch
Size: 1577 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230707/d7252416/attachment.bin>