Merge commit 'c030ba2fc8f1' from llvm.org/main into apple/main

Author: git apple-llvm automerger

mlir/include/mlir/Interfaces/InferTypeOpInterface.h

@@ -76,6 +76,10 @@ class ShapedTypeComponents {
   Attribute attr;
 };
 
+/// Range of values and shapes (corresponding effectively to Shapes dialect's
+/// ValueShape type concept).
+using ValueShapeRange = ValueRange;
+
 namespace detail {
 // Helper function to infer return tensor returns types given element and shape
 // inference function.

mlir/include/mlir/Interfaces/InferTypeOpInterface.td

@@ -93,7 +93,7 @@ def InferShapedTypeOpInterface : OpInterface<"InferShapedTypeOpInterface"> {
       /*methodName=*/"inferReturnTypeComponents",
       /*args=*/(ins "::mlir::MLIRContext*":$context,
                     "::mlir::Optional<::mlir::Location>":$location,
-                    "::mlir::ValueRange":$operands,
+                    "::mlir::ValueShapeRange":$operands,
                     "::mlir::DictionaryAttr":$attributes,
                     "::mlir::RegionRange":$regions,
                     "::mlir::SmallVectorImpl<::mlir::ShapedTypeComponents>&":