Use dereference instead of implicit conversion for IndexedValue to Value*.

Avoids ambiguous constructor error on some compilers.

PiperOrigin-RevId: 240606838

diff --git a/mlir/include/mlir/EDSC/Helpers.h b/mlir/include/mlir/EDSC/Helpers.h
index 8fc9072..5dfc959 100644 (file)
--- a/mlir/include/mlir/EDSC/Helpers.h
+++ b/mlir/include/mlir/EDSC/Helpers.h
@@ -157,7 +157,7 @@ template <typename Load, typename Store> struct TemplatedIndexedValue {
   }
 
   /// Emits a `load` when converting to a Value*.
-  operator Value *() const {
+  Value *operator*(void)const {
     return Load(getBase(), {indices.begin(), indices.end()}).getValue();
   }
 

diff --git a/mlir/test/EDSC/builder-api-test.cpp b/mlir/test/EDSC/builder-api-test.cpp
index 2306ac2..ec8ceb4 100644 (file)
--- a/mlir/test/EDSC/builder-api-test.cpp
+++ b/mlir/test/EDSC/builder-api-test.cpp
@@ -444,7 +444,7 @@ TEST_FUNC(select_op) {
     // Without it, one must force conversion to ValueHandle as such:
     //   edsc::intrinsics::select(
     //      i == zero, ValueHandle(A(zero, zero)), ValueHandle(ValueA(i, j)))
-    edsc::intrinsics::select(i == zero, A(zero, zero), A(i, j))
+    edsc::intrinsics::select(i == zero, *A(zero, zero), *A(i, j))
   });
 
   // CHECK-LABEL: @select_op