From 75eca67c1c4b53a07a70cd3c8036713aec537769 Mon Sep 17 00:00:00 2001 From: River Riddle Date: Thu, 10 Dec 2020 12:44:35 -0800 Subject: [PATCH] [mlir][Parser] Fix crash in DenseElementsAttr parser when no elements are parsed This fixes a crash when no elements are parsed, but the type expects at least one. Fixes PR#47763 Differential Revision: https://reviews.llvm.org/D92982 --- mlir/lib/Parser/AttributeParser.cpp | 7 +++++++ mlir/test/IR/invalid.mlir | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/mlir/lib/Parser/AttributeParser.cpp b/mlir/lib/Parser/AttributeParser.cpp index 2e385cf..e78237e 100644 --- a/mlir/lib/Parser/AttributeParser.cpp +++ b/mlir/lib/Parser/AttributeParser.cpp @@ -531,6 +531,13 @@ DenseElementsAttr TensorLiteralParser::getAttr(llvm::SMLoc loc, return nullptr; } + // Handle the case where no elements were parsed. + if (!hexStorage.hasValue() && storage.empty() && type.getNumElements()) { + p.emitError(loc) << "parsed zero elements, but type (" << type + << ") expected at least 1"; + return nullptr; + } + // Handle complex types in the specific element type cases below. bool isComplex = false; if (ComplexType complexTy = eltType.dyn_cast()) { diff --git a/mlir/test/IR/invalid.mlir b/mlir/test/IR/invalid.mlir index 4930341a..6b28b33 100644 --- a/mlir/test/IR/invalid.mlir +++ b/mlir/test/IR/invalid.mlir @@ -687,6 +687,11 @@ func @elementsattr_toolarge1() -> () { // ----- +// expected-error@+1 {{parsed zero elements, but type ('tensor') expected at least 1}} +#attr = dense<> : tensor + +// ----- + func @elementsattr_toolarge2() -> () { ^bb0: "foo"(){bar = dense<[-777]> : tensor<1xi8>} : () -> () // expected-error {{integer constant out of range}} -- 2.7.4