Address review issue

Author: yuslepukhin

onnxruntime/core/framework/execution_frame.cc

@@ -177,16 +177,14 @@ Status IExecutionFrame::GetOrCreateNodeOutputMLValue(const int output_index, int
       bool shape_matched = true;
 
       if (p_ort_value->IsTensor()) {
-        if (shape) {
-          const Tensor& tensor = p_ort_value->Get<Tensor>();
-          shape_matched = (tensor.Shape() == *shape);
-        }
+        ORT_RETURN_IF_NOT(shape != nullptr, "shape must not be null for tensor output that is already allocated");
+        const Tensor& tensor = p_ort_value->Get<Tensor>();
+        shape_matched = (tensor.Shape() == *shape);
       } else if (p_ort_value->IsSparseTensor()) {
 #if !defined(DISABLE_SPARSE_TENSORS)
-        if (shape) {
-          const SparseTensor& sp_tensor = p_ort_value->Get<SparseTensor>();
-          shape_matched = (sp_tensor.DenseShape() == *shape);
-        }
+        ORT_RETURN_IF_NOT(shape != nullptr, "shape must not be null for sparse tensor output that is already allocated");
+        const SparseTensor& sp_tensor = p_ort_value->Get<SparseTensor>();
+        shape_matched = (sp_tensor.DenseShape() == *shape);
 #endif
       }
 

onnxruntime/core/framework/op_kernel.cc

@@ -126,7 +126,7 @@ OrtValue* OpKernelContext::GetOrCreateOutputMLValue(int index) {
   auto output_arg_index = GetOutputArgIndex(index);
   OrtValue* value = nullptr;
   auto status = execution_frame_->GetOrCreateNodeOutputMLValue(index, output_arg_index, nullptr, value, kernel_->Node());
-  ORT_ENFORCE(status.IsOK(), status.ErrorMessage());
+  ORT_THROW_IF_ERROR(status);
   return value;
 }