Merge pull request #438 from Xilinx/jrickert.stack_use

Fix return of pointer to local variable. TypeRange is not-owning and should not be used to return memory allocated inside a function/on the stack.

Author: jorickert

src/Dialect/ONNX/DialectBuilder.cpp

@@ -555,13 +555,13 @@ TensorType OnnxBuilder::toTensor(Type input) const {
   return RankedTensorType::get(aTy.getShape(), elementTy);
 }
 
-TypeRange OnnxBuilder::toTensors(TypeRange inputs) const {
+llvm::SmallVector<Type> OnnxBuilder::toTensors(TypeRange inputs) const {
   if (llvm::all_of(inputs, [](Type t) { return (mlir::isa<TensorType>(t)); }))
     return inputs;
   assert(llvm::all_of(inputs, [](Type t) {
     return (mlir::isa<MemRefType>(t));
   }) && "All inputs expect RankedMemref type when not a TensorType");
-  llvm::SmallVector<Type, 4> resultTypes;
+  llvm::SmallVector<Type> resultTypes;
   for (uint64_t i = 0; i < inputs.size(); ++i) {
     ShapedType aTy = mlir::cast<ShapedType>(inputs[i]);
     Type elementTy = aTy.getElementType();

src/Dialect/ONNX/DialectBuilder.hpp

@@ -232,7 +232,7 @@ struct OnnxBuilder : DialectBuilder {
   // Convert a Type to TensorType if it is of MemRefType.
   mlir::TensorType toTensor(mlir::Type input) const;
   // Convert Type to TypeRange of TensorType if it is of MemRefType.
-  mlir::TypeRange toTensors(mlir::TypeRange inputs) const;
+  llvm::SmallVector<mlir::Type> toTensors(mlir::TypeRange inputs) const;
   // Convert a Value to MemrefType if it is of TensorType.
   mlir::Value toMemref(mlir::Value input) const;