Merge pull request #4721 from ldoolitt/main

kernel/drivertools.h: avoid maybe-uninitialized compile warnings
YosysHQ · Nov 27, 2024 · 1717a0b · 1717a0b
2 parents 956313e + 3ae9ca7
commit 1717a0b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/kernel/drivertools.h b/kernel/drivertools.h
@@ -364,7 +364,7 @@ struct DriveBit
 
 	unsigned int hash() const
 	{
-		unsigned int inner;
+		unsigned int inner = 0;
 		switch (type_)
 		{
 			case DriveType::NONE:
@@ -385,6 +385,9 @@ struct DriveBit
 			case DriveType::MULTIPLE:
 				inner = multiple_.hash();
 				break;
+			default:
+				log_abort();
+				break;
 		}
 		return mkhash((unsigned int)type_, inner);
 	}
@@ -912,7 +915,7 @@ struct DriveChunk
 
 	unsigned int hash() const
 	{
-		unsigned int inner;
+		unsigned int inner = 0;
 		switch (type_)
 		{
 			case DriveType::NONE:
@@ -933,6 +936,9 @@ struct DriveChunk
 			case DriveType::MULTIPLE:
 				inner = multiple_.hash();
 				break;
+			default:
+				log_abort();
+				break;
 		}
 		return mkhash((unsigned int)type_, inner);
 	}