Merge branch 'common-block-segfault-fix' into master+wip

acomodi · acomodi · commit 0a9cb27745fa · 2019-09-04T10:43:24.000+02:00
diff --git a/vpr/src/util/vpr_utils.cpp b/vpr/src/util/vpr_utils.cpp
@@ -779,6 +779,7 @@ t_logical_block_type_ptr find_most_common_block_type(const DeviceGrid& grid) {
 
     if (max_type == nullptr) {
         VTR_LOG_WARN("Unable to determine most common block type (perhaps the device grid was empty?)\n");
+        return nullptr;
     }
     return logical_block_type(max_type);
 }

Original file line number	Diff line number	Diff line change
`@@ -779,6 +779,7 @@ t_logical_block_type_ptr find_most_common_block_type(const DeviceGrid& grid) {`
`779`	`779`
`780`	`780`	`if (max_type == nullptr) {`
`781`	`781`	`VTR_LOG_WARN("Unable to determine most common block type (perhaps the device grid was empty?)\n");`
	`782`	`+ return nullptr;`
`782`	`783`	`}`
`783`	`784`	`return logical_block_type(max_type);`
`784`	`785`	`}`