[Bf-blender-cvs] [30ec0753c75] blender-v2.91-release: Revert "Fix T81077 id_management test on macOS"
Ankit Meel
noreply at git.blender.org
Wed Oct 28 16:43:06 CET 2020
Commit: 30ec0753c75ca4c4ca8744727b7ac70b12d074f6
Author: Ankit Meel
Date: Wed Oct 28 20:54:10 2020 +0530
Branches: blender-v2.91-release
https://developer.blender.org/rB30ec0753c75ca4c4ca8744727b7ac70b12d074f6
Revert "Fix T81077 id_management test on macOS"
This reverts commit 2ddecfffc3d3a3a1db4ae45e8665caa2a85ab43a.
The correct fix is to compile with -fno-strict-aliasing on
release/relwithdebinfo builds also.
See the last commit/ {D9372}.
Maniphest Task T81077
===================================================================
M source/blender/blenkernel/intern/lib_id_delete.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index 25c48479ef9..1e45a3c1163 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -261,9 +261,7 @@ static void id_delete(Main *bmain, const bool do_tagged_deletion)
bool keep_looping = true;
while (keep_looping) {
ID *id, *id_next;
- /* Marked volatile to avoid a macOS Clang optimization bug. See T81077.
- * #last_remapped_id.next is assumed to be NULL by optimizer which is wrong. */
- volatile ID *last_remapped_id = tagged_deleted_ids.last;
+ ID *last_remapped_id = tagged_deleted_ids.last;
keep_looping = false;
/* First tag and remove from Main all datablocks directly from target lib.
More information about the Bf-blender-cvs
mailing list