Changeset 97361 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Nov 1, 2022 2:02:24 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154359

Message:

VMM/IEM: Removed a lot of now unnecessary return statements, while keeping unnecessary break statements for the look of the think. Also added missing IEM_NOT_REACHED_DEFAULT_CASE_RET uses to try make sure all cases in the switches will return and we can skip the function (typically) return statement. bugref:9898

File:

• trunk/src/VBox/VMM/include/IEMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -3241 +3241 @@
 /** Used to shut up GCC warnings about variables that 'may be used uninitialized'
  * due to GCC lacking knowledge about the value range of a switch. */
-#define IEM_NOT_REACHED_DEFAULT_CASE_RET() default: AssertFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE)
+#if RT_CPLUSPLUS_PREREQ(202000)
+# define IEM_NOT_REACHED_DEFAULT_CASE_RET() default: [[unlikely]] AssertFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE)
+#else
+# define IEM_NOT_REACHED_DEFAULT_CASE_RET() default: AssertFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE)
+#endif
 
 /** Variant of IEM_NOT_REACHED_DEFAULT_CASE_RET that returns a custom value. */
-#define IEM_NOT_REACHED_DEFAULT_CASE_RET2(a_RetValue) default: AssertFailedReturn(a_RetValue)
+#if RT_CPLUSPLUS_PREREQ(202000)
+# define IEM_NOT_REACHED_DEFAULT_CASE_RET2(a_RetValue) default: [[unlikely]] AssertFailedReturn(a_RetValue)
+#else
+# define IEM_NOT_REACHED_DEFAULT_CASE_RET2(a_RetValue) default: AssertFailedReturn(a_RetValue)
+#endif
 
 /**