Merge pull request #66543 from akien-mga/msvc-warning-c4702

akien-mga · akien-mga · commit a9591f303956 · 2022-09-28T20:47:30.000+02:00
Fix MSVC warning C4702: unreachable code
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
@@ -264,7 +264,7 @@ bool BaseButton::is_hovered() const {
 BaseButton::DrawMode BaseButton::get_draw_mode() const {
 	if (status.disabled) {
 		return DRAW_DISABLED;
-	};
+	}
 
 	if (!status.press_attempt && status.hovering) {
 		if (status.pressed) {
@@ -273,8 +273,7 @@ BaseButton::DrawMode BaseButton::get_draw_mode() const {
 
 		return DRAW_HOVER;
 	} else {
-		/* determine if pressed or not */
-
+		// Determine if pressed or not.
 		bool pressing;
 		if (status.press_attempt) {
 			pressing = (status.pressing_inside || keep_pressed_outside);
@@ -291,8 +290,6 @@ BaseButton::DrawMode BaseButton::get_draw_mode() const {
 			return DRAW_NORMAL;
 		}
 	}
-
-	return DRAW_NORMAL;
 }
 
 void BaseButton::set_toggle_mode(bool p_on) {
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
@@ -52,7 +52,7 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->next()) {
 			return p_item->E->next()->get();
 		} else {
-			//go up until something with a next is found
+			// Go up until something with a next is found.
 			while (p_item->parent && !p_item->E->next()) {
 				p_item = p_item->parent;
 			}
@@ -72,7 +72,7 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->next()) {
 			return p_item->E->next()->get();
 		} else {
-			//go up until something with a next is found
+			// Go up until something with a next is found.
 			while (p_item->type != ITEM_FRAME && !p_item->E->next()) {
 				p_item = p_item->parent;
 			}
@@ -84,8 +84,6 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 			}
 		}
 	}
-
-	return nullptr;
 }
 
 RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) const {
@@ -97,7 +95,7 @@ RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->prev()) {
 			return p_item->E->prev()->get();
 		} else {
-			//go back until something with a prev is found
+			// Go back until something with a prev is found.
 			while (p_item->parent && !p_item->E->prev()) {
 				p_item = p_item->parent;
 			}
@@ -117,7 +115,7 @@ RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) co
 		} else if (p_item->E->prev()) {
 			return p_item->E->prev()->get();
 		} else {
-			//go back until something with a prev is found
+			// Go back until something with a prev is found.
 			while (p_item->type != ITEM_FRAME && !p_item->E->prev()) {
 				p_item = p_item->parent;
 			}
@@ -129,8 +127,6 @@ RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) co
 			}
 		}
 	}
-
-	return nullptr;
 }
 
 Rect2 RichTextLabel::_get_text_rect() {
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
@@ -2102,11 +2102,9 @@ bool Animation::track_is_compressed(int p_track) const {
 			return bst->compressed_track >= 0;
 		} break;
 		default: {
-			return false; //animation does not really use transitions
+			return false; // Animation does not really use transitions.
 		} break;
 	}
-
-	ERR_FAIL_V(false);
 }
 
 void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p_value) {
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
@@ -3123,8 +3123,6 @@ bool StandardMaterial3D::_set(const StringName &p_name, const Variant &p_value)
 		WARN_PRINT("Godot 3.x SpatialMaterial remapped parameter not found: " + String(p_name));
 		return true;
 	}
-
-	return false;
 }
 
 #endif // DISABLE_DEPRECATED
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp
@@ -1537,7 +1537,6 @@ Vector<Point2> TileSet::get_terrain_polygon(int p_terrain_set) {
 		}
 		return _get_half_offset_terrain_polygon(tile_size, overlap, tile_offset_axis);
 	}
-	return Vector<Point2>();
 }
 
 Vector<Point2> TileSet::get_terrain_peering_bit_polygon(int p_terrain_set, TileSet::CellNeighbor p_bit) {
diff --git a/scene/resources/visual_shader_particle_nodes.cpp b/scene/resources/visual_shader_particle_nodes.cpp
@@ -1130,31 +1130,38 @@ VisualShaderNodeParticleAccelerator::VisualShaderNodeParticleAccelerator() {
 // VisualShaderNodeParticleOutput
 
 String VisualShaderNodeParticleOutput::get_caption() const {
-	if (shader_type == VisualShader::TYPE_START) {
-		return "StartOutput";
-	} else if (shader_type == VisualShader::TYPE_PROCESS) {
-		return "ProcessOutput";
-	} else if (shader_type == VisualShader::TYPE_COLLIDE) {
-		return "CollideOutput";
-	} else if (shader_type == VisualShader::TYPE_START_CUSTOM) {
-		return "CustomStartOutput";
-	} else if (shader_type == VisualShader::TYPE_PROCESS_CUSTOM) {
-		return "CustomProcessOutput";
+	switch (shader_type) {
+		case VisualShader::TYPE_START:
+			return "StartOutput";
+		case VisualShader::TYPE_PROCESS:
+			return "ProcessOutput";
+		case VisualShader::TYPE_COLLIDE:
+			return "CollideOutput";
+		case VisualShader::TYPE_START_CUSTOM:
+			return "CustomStartOutput";
+		case VisualShader::TYPE_PROCESS_CUSTOM:
+			return "CustomProcessOutput";
+		default:
+			ERR_PRINT(vformat("Unexpected shader_type %d for VisualShaderNodeParticleOutput.", shader_type));
+			return "";
 	}
-	return String();
 }
 
 int VisualShaderNodeParticleOutput::get_input_port_count() const {
-	if (shader_type == VisualShader::TYPE_START) {
-		return 8;
-	} else if (shader_type == VisualShader::TYPE_COLLIDE) {
-		return 5;
-	} else if (shader_type == VisualShader::TYPE_START_CUSTOM || shader_type == VisualShader::TYPE_PROCESS_CUSTOM) {
-		return 6;
-	} else { // TYPE_PROCESS
-		return 7;
+	switch (shader_type) {
+		case VisualShader::TYPE_START:
+			return 8;
+		case VisualShader::TYPE_PROCESS:
+			return 7;
+		case VisualShader::TYPE_COLLIDE:
+			return 5;
+		case VisualShader::TYPE_START_CUSTOM:
+		case VisualShader::TYPE_PROCESS_CUSTOM:
+			return 6;
+		default:
+			ERR_PRINT(vformat("Unexpected shader_type %d for VisualShaderNodeParticleOutput.", shader_type));
+			return 0;
 	}
-	return 0;
 }
 
 VisualShaderNodeParticleOutput::PortType VisualShaderNodeParticleOutput::get_input_port_type(int p_port) const {
diff --git a/servers/physics_2d/godot_space_2d.cpp b/servers/physics_2d/godot_space_2d.cpp
@@ -1036,8 +1036,6 @@ void *GodotSpace2D::_broadphase_pair(GodotCollisionObject2D *A, int p_subindex_A
 		GodotBodyPair2D *b = memnew(GodotBodyPair2D(static_cast<GodotBody2D *>(A), p_subindex_A, static_cast<GodotBody2D *>(B), p_subindex_B));
 		return b;
 	}
-
-	return nullptr;
 }
 
 void GodotSpace2D::_broadphase_unpair(GodotCollisionObject2D *A, int p_subindex_A, GodotCollisionObject2D *B, int p_subindex_B, void *p_data, void *p_self) {
diff --git a/servers/rendering/renderer_rd/environment/fog.cpp b/servers/rendering/renderer_rd/environment/fog.cpp
@@ -122,8 +122,6 @@ AABB Fog::fog_volume_get_aabb(RID p_fog_volume) const {
 			return AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2));
 		}
 	}
-
-	return AABB();
 }
 
 Vector3 Fog::fog_volume_get_extents(RID p_fog_volume) const {
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
@@ -282,8 +282,6 @@ Ref<Image> RendererSceneRenderRD::environment_bake_panorama(RID p_env, bool p_ba
 		panorama->fill(panorama_color);
 		return panorama;
 	}
-
-	return Ref<Image>();
 }
 
 ////////////////////////////////////////////////////////////
diff --git a/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
@@ -1874,8 +1874,6 @@ AABB ParticlesStorage::particles_collision_get_aabb(RID p_particles_collision) c
 			return aabb;
 		}
 	}
-
-	return AABB();
 }
 
 Vector3 ParticlesStorage::particles_collision_get_extents(RID p_particles_collision) const {
diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp
@@ -4396,8 +4396,6 @@ bool ShaderLanguage::_is_operator_assign(Operator p_op) const {
 		default:
 			return false;
 	}
-
-	return false;
 }
 
 bool ShaderLanguage::_validate_varying_assign(ShaderNode::Varying &p_varying, String *r_message) {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ RichTextLabel::Item RichTextLabel::_get_next_item(Item p_item, bool p_free) co`
`52`	`52`	`} else if (p_item->E->next()) {`
`53`	`53`	`return p_item->E->next()->get();`
`54`	`54`	`} else {`
`55`		`- //go up until something with a next is found`
	`55`	`+ // Go up until something with a next is found.`
`56`	`56`	`while (p_item->parent && !p_item->E->next()) {`
`57`	`57`	`p_item = p_item->parent;`
`58`	`58`	`}`
`@@ -72,7 +72,7 @@ RichTextLabel::Item RichTextLabel::_get_next_item(Item p_item, bool p_free) co`
`72`	`72`	`} else if (p_item->E->next()) {`
`73`	`73`	`return p_item->E->next()->get();`
`74`	`74`	`} else {`
`75`		`- //go up until something with a next is found`
	`75`	`+ // Go up until something with a next is found.`
`76`	`76`	`while (p_item->type != ITEM_FRAME && !p_item->E->next()) {`
`77`	`77`	`p_item = p_item->parent;`
`78`	`78`	`}`
`@@ -84,8 +84,6 @@ RichTextLabel::Item RichTextLabel::_get_next_item(Item p_item, bool p_free) co`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`-`
`88`		`- return nullptr;`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`RichTextLabel::Item RichTextLabel::_get_prev_item(Item p_item, bool p_free) const {`
`@@ -97,7 +95,7 @@ RichTextLabel::Item RichTextLabel::_get_prev_item(Item p_item, bool p_free) co`
`97`	`95`	`} else if (p_item->E->prev()) {`
`98`	`96`	`return p_item->E->prev()->get();`
`99`	`97`	`} else {`
`100`		`- //go back until something with a prev is found`
	`98`	`+ // Go back until something with a prev is found.`
`101`	`99`	`while (p_item->parent && !p_item->E->prev()) {`
`102`	`100`	`p_item = p_item->parent;`
`103`	`101`	`}`
`@@ -117,7 +115,7 @@ RichTextLabel::Item RichTextLabel::_get_prev_item(Item p_item, bool p_free) co`
`117`	`115`	`} else if (p_item->E->prev()) {`
`118`	`116`	`return p_item->E->prev()->get();`
`119`	`117`	`} else {`
`120`		`- //go back until something with a prev is found`
	`118`	`+ // Go back until something with a prev is found.`
`121`	`119`	`while (p_item->type != ITEM_FRAME && !p_item->E->prev()) {`
`122`	`120`	`p_item = p_item->parent;`
`123`	`121`	`}`
`@@ -129,8 +127,6 @@ RichTextLabel::Item RichTextLabel::_get_prev_item(Item p_item, bool p_free) co`
`129`	`127`	`}`
`130`	`128`	`}`
`131`	`129`	`}`
`132`		`-`
`133`		`- return nullptr;`
`134`	`130`	`}`
`135`	`131`
`136`	`132`	`Rect2 RichTextLabel::_get_text_rect() {`
Original file line number	Diff line number	Diff line change
`@@ -2102,11 +2102,9 @@ bool Animation::track_is_compressed(int p_track) const {`
`2102`	`2102`	`return bst->compressed_track >= 0;`
`2103`	`2103`	`} break;`
`2104`	`2104`	`default: {`
`2105`		`- return false; //animation does not really use transitions`
	`2105`	`+ return false; // Animation does not really use transitions.`
`2106`	`2106`	`} break;`
`2107`	`2107`	`}`
`2108`		`-`
`2109`		`- ERR_FAIL_V(false);`
`2110`	`2108`	`}`
`2111`	`2109`
`2112`	`2110`	`void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p_value) {`
Original file line number	Diff line number	Diff line change
`@@ -3123,8 +3123,6 @@ bool StandardMaterial3D::_set(const StringName &p_name, const Variant &p_value)`
`3123`	`3123`	`WARN_PRINT("Godot 3.x SpatialMaterial remapped parameter not found: " + String(p_name));`
`3124`	`3124`	`return true;`
`3125`	`3125`	`}`
`3126`		`-`
`3127`		`- return false;`
`3128`	`3126`	`}`
`3129`	`3127`
`3130`	`3128`	`#endif // DISABLE_DEPRECATED`
Original file line number	Diff line number	Diff line change
`@@ -1537,7 +1537,6 @@ Vector<Point2> TileSet::get_terrain_polygon(int p_terrain_set) {`
`1537`	`1537`	`}`
`1538`	`1538`	`return _get_half_offset_terrain_polygon(tile_size, overlap, tile_offset_axis);`
`1539`	`1539`	`}`
`1540`		`- return Vector<Point2>();`
`1541`	`1540`	`}`
`1542`	`1541`
`1543`	`1542`	`Vector<Point2> TileSet::get_terrain_peering_bit_polygon(int p_terrain_set, TileSet::CellNeighbor p_bit) {`
Original file line number	Diff line number	Diff line change
`@@ -1036,8 +1036,6 @@ void GodotSpace2D::_broadphase_pair(GodotCollisionObject2D A, int p_subindex_A`
`1036`	`1036`	`GodotBodyPair2D b = memnew(GodotBodyPair2D(static_cast<GodotBody2D >(A), p_subindex_A, static_cast<GodotBody2D *>(B), p_subindex_B));`
`1037`	`1037`	`return b;`
`1038`	`1038`	`}`
`1039`		`-`
`1040`		`- return nullptr;`
`1041`	`1039`	`}`
`1042`	`1040`
`1043`	`1041`	`void GodotSpace2D::_broadphase_unpair(GodotCollisionObject2D A, int p_subindex_A, GodotCollisionObject2D B, int p_subindex_B, void p_data, void p_self) {`
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,6 @@ AABB Fog::fog_volume_get_aabb(RID p_fog_volume) const {`
`122`	`122`	`return AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2));`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`-`
`126`		`- return AABB();`
`127`	`125`	`}`
`128`	`126`
`129`	`127`	`Vector3 Fog::fog_volume_get_extents(RID p_fog_volume) const {`
Original file line number	Diff line number	Diff line change
`@@ -282,8 +282,6 @@ Ref<Image> RendererSceneRenderRD::environment_bake_panorama(RID p_env, bool p_ba`
`282`	`282`	`panorama->fill(panorama_color);`
`283`	`283`	`return panorama;`
`284`	`284`	`}`
`285`		`-`
`286`		`- return Ref<Image>();`
`287`	`285`	`}`
`288`	`286`
`289`	`287`	`////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -1874,8 +1874,6 @@ AABB ParticlesStorage::particles_collision_get_aabb(RID p_particles_collision) c`
`1874`	`1874`	`return aabb;`
`1875`	`1875`	`}`
`1876`	`1876`	`}`
`1877`		`-`
`1878`		`- return AABB();`
`1879`	`1877`	`}`
`1880`	`1878`
`1881`	`1879`	`Vector3 ParticlesStorage::particles_collision_get_extents(RID p_particles_collision) const {`