disable asan on arrow_datatype as well

rerun-io · Mar 18, 2024 · 1e2a145 · 1e2a145
1 parent 71edf5b
commit 1e2a145
Show file tree

Hide file tree

Showing 41 changed files with 100 additions and 106 deletions.
diff --git a/crates/re_types_builder/src/codegen/cpp/mod.rs b/crates/re_types_builder/src/codegen/cpp/mod.rs
@@ -1363,13 +1363,11 @@ fn arrow_data_type_method(
 ) -> Method {
     hpp_includes.insert_system("memory"); // std::shared_ptr
 
-    let (inline, definition_body) = if transparent_forwarded_fqname(obj).is_some() {
-        (
-            true,
-            quote! {
-                return Loggable<TypeFwd>::arrow_datatype();
-            },
-        )
+    let is_forwarding = transparent_forwarded_fqname(obj).is_some();
+    let definition_body = if is_forwarding {
+        quote! {
+            return Loggable<TypeFwd>::arrow_datatype();
+        }
     } else {
         cpp_includes.insert_system("arrow/type_fwd.h");
         hpp_declarations.insert("arrow", ForwardDecl::Class(format_ident!("DataType")));
@@ -1381,24 +1379,29 @@ fn arrow_data_type_method(
             true,
         );
 
-        (
-            false,
-            quote! {
-                static const auto datatype = #quoted_datatype;
-                return datatype;
-            },
-        )
+        quote! {
+            static const auto datatype = #quoted_datatype;
+            return datatype;
+        }
+    };
+    let return_type = if is_forwarding {
+        // Disable asan since we got rather strange spurious ci failure on Linux with these methods:
+        // Some Linux runs end up spamming `AddressSanitizer:DEADLYSIGNAL` indefinitely with no additional information.1
+        hpp_includes.insert_rerun("compiler_utils.hpp"); // RR_DISABLE_ASAN
+        quote! { RR_DISABLE_ASAN const std::shared_ptr<arrow::DataType>& }
+    } else {
+        quote! { const std::shared_ptr<arrow::DataType>& }
     };
 
     Method {
         docs: "Returns the arrow data type this type corresponds to.".into(),
         declaration: MethodDeclaration {
             is_static: true,
-            return_type: quote! { const std::shared_ptr<arrow::DataType>& },
+            return_type,
             name_and_parameters: quote! { arrow_datatype() },
         },
         definition_body,
-        inline,
+        inline: is_forwarding,
     }
 }
 
@@ -1499,23 +1502,14 @@ fn to_arrow_method(
         }
     };
 
-    let return_type = if is_forwarding {
-        // Disable asan since we got rather strange spurious ci failure on Linux with these methods:
-        // Some Linux runs end up spamming `AddressSanitizer:DEADLYSIGNAL`` indefinitely with no additional information.1
-        hpp_includes.insert_rerun("compiler_utils.hpp"); // RR_DISABLE_ASAN
-        quote! { RR_DISABLE_ASAN Result<std::shared_ptr<arrow::Array>> }
-    } else {
-        quote! { Result<std::shared_ptr<arrow::Array>> }
-    };
-
     Method {
         docs: format!(
             "Serializes an array of `rerun::{quoted_namespace}::{type_ident}` into an arrow array."
         )
         .into(),
         declaration: MethodDeclaration {
             is_static: true,
-            return_type,
+            return_type: quote! { Result<std::shared_ptr<arrow::Array>> },
             name_and_parameters: quote! {
                 to_arrow(const #quoted_namespace::#type_ident* instances, size_t num_instances)
             },

diff --git a/rerun_cpp/src/rerun/blueprint/components/active_tab.hpp b/rerun_cpp/src/rerun/blueprint/components/active_tab.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/included_content.hpp b/rerun_cpp/src/rerun/blueprint/components/included_content.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/included_space_view.hpp b/rerun_cpp/src/rerun/blueprint/components/included_space_view.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp b/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/query_expression.hpp b/rerun_cpp/src/rerun/blueprint/components/query_expression.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/root_container.hpp b/rerun_cpp/src/rerun/blueprint/components/root_container.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/space_view_class.hpp b/rerun_cpp/src/rerun/blueprint/components/space_view_class.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/space_view_maximized.hpp b/rerun_cpp/src/rerun/blueprint/components/space_view_maximized.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/space_view_origin.hpp b/rerun_cpp/src/rerun/blueprint/components/space_view_origin.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/viewer_recommendation_hash.hpp b/rerun_cpp/src/rerun/blueprint/components/viewer_recommendation_hash.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components/visible_time_range.hpp b/rerun_cpp/src/rerun/blueprint/components/visible_time_range.hpp
diff --git a/rerun_cpp/src/rerun/components/class_id.hpp b/rerun_cpp/src/rerun/components/class_id.hpp
diff --git a/rerun_cpp/src/rerun/components/color.hpp b/rerun_cpp/src/rerun/components/color.hpp
diff --git a/rerun_cpp/src/rerun/components/half_sizes2d.hpp b/rerun_cpp/src/rerun/components/half_sizes2d.hpp
diff --git a/rerun_cpp/src/rerun/components/half_sizes3d.hpp b/rerun_cpp/src/rerun/components/half_sizes3d.hpp
diff --git a/rerun_cpp/src/rerun/components/keypoint_id.hpp b/rerun_cpp/src/rerun/components/keypoint_id.hpp
diff --git a/rerun_cpp/src/rerun/components/material.hpp b/rerun_cpp/src/rerun/components/material.hpp
diff --git a/rerun_cpp/src/rerun/components/media_type.hpp b/rerun_cpp/src/rerun/components/media_type.hpp
diff --git a/rerun_cpp/src/rerun/components/mesh_properties.hpp b/rerun_cpp/src/rerun/components/mesh_properties.hpp
diff --git a/rerun_cpp/src/rerun/components/name.hpp b/rerun_cpp/src/rerun/components/name.hpp
diff --git a/rerun_cpp/src/rerun/components/out_of_tree_transform3d.hpp b/rerun_cpp/src/rerun/components/out_of_tree_transform3d.hpp