[PA-E] Use FreeFlags::kNoHooks consistently

As a result of accumulated patches for long years, PA-E functions are
inconsistent on FreeFlags::kNoHooks usage. This patch changes some
functions to use FreeFlags::kNoHooks. After this every function should
be using it.

Change-Id: I83d8bb1dddf732e60358207a1b4bb0c97d707b3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5901487
Reviewed-by: Takashi Sakamoto <[email protected]>
Commit-Queue: Mikihito Matsuura <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1363181}


CrOS-Libchrome-Original-Commit: 021934729cf4dd8d23a173cb499161fdc7a31905

Author: mikt

base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc

@@ -286,8 +286,8 @@ void* PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::
   } else {
     // size == 0 and address != null means just "free(address)".
     if (address) {
-      partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-          base_free_flags | partition_alloc::FreeFlags::kNoHooks>(address);
+      partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+          address);
     }
   }
   // The original memory block (specified by address) is unchanged if ENOMEM.
@@ -301,8 +301,8 @@ void* PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::
     size_t copy_size = usage > size ? size : usage;
     memcpy(new_ptr, address, copy_size);
 
-    partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-        base_free_flags | partition_alloc::FreeFlags::kNoHooks>(address);
+    partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+        address);
   }
   return new_ptr;
 }
@@ -324,8 +324,8 @@ void* PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::
   } else {
     // size == 0 and address != null means just "free(address)".
     if (address) {
-      partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-          base_free_flags | partition_alloc::FreeFlags::kNoHooks>(address);
+      partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+          address);
     }
   }
   // The original memory block (specified by address) is unchanged if ENOMEM.
@@ -339,8 +339,8 @@ void* PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::
     size_t copy_size = usage > size ? size : usage;
     memcpy(new_ptr, address, copy_size);
 
-    partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-        base_free_flags | partition_alloc::FreeFlags::kNoHooks>(address);
+    partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+        address);
   }
   return new_ptr;
 }
@@ -431,8 +431,8 @@ PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::Free(
   }
 #endif  // PA_BUILDFLAG(IS_CAST_ANDROID)
 
-  partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-      base_free_flags | partition_alloc::FreeFlags::kNoHooks>(object);
+  partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+      object);
 }
 
 #if PA_BUILDFLAG(IS_APPLE)
@@ -450,8 +450,8 @@ void PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::
   partition_alloc::ScopedDisallowAllocations guard{};
   // TODO(lizeb): Optimize PartitionAlloc to use the size information. This is
   // still useful though, as we avoid double-checking that the address is owned.
-  partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-      base_free_flags | partition_alloc::FreeFlags::kNoHooks>(address);
+  partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+      address);
 }
 #endif  // PA_BUILDFLAG(IS_APPLE)
 
@@ -557,20 +557,21 @@ void PartitionAllocFunctionsInternal<base_alloc_flags, base_free_flags>::
     return allocator_shim::TryFreeDefaultFallbackToFindZoneAndFree(address);
   }
 
-  partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<
-      base_free_flags | partition_alloc::FreeFlags::kNoHooks>(address);
+  partition_alloc::PartitionRoot::FreeInlineInUnknownRoot<base_free_flags>(
+      address);
 }
 #endif  // PA_BUILDFLAG(IS_APPLE)
 
 // Explicitly instantiate `PartitionAllocFunctions`.
 template class PA_COMPONENT_EXPORT(ALLOCATOR_SHIM)
     PartitionAllocFunctionsInternal<partition_alloc::AllocFlags::kNoHooks,
-                                    partition_alloc::FreeFlags::kNone>;
+                                    partition_alloc::FreeFlags::kNoHooks>;
 // Explicitly instantiate `PartitionAllocWithAdvancedChecksFunctions`.
 template class PA_COMPONENT_EXPORT(ALLOCATOR_SHIM)
     PartitionAllocFunctionsInternal<
         partition_alloc::AllocFlags::kNoHooks,
-        partition_alloc::FreeFlags::kZap |
+        partition_alloc::FreeFlags::kNoHooks |
+            partition_alloc::FreeFlags::kZap |
             partition_alloc::FreeFlags::kSchedulerLoopQuarantine>;
 
 // static

base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.h

@@ -130,22 +130,24 @@ class PartitionAllocFunctionsInternal {
 
 using PartitionAllocFunctions =
     PartitionAllocFunctionsInternal<partition_alloc::AllocFlags::kNoHooks,
-                                    partition_alloc::FreeFlags::kNone>;
+                                    partition_alloc::FreeFlags::kNoHooks>;
 using PartitionAllocWithAdvancedChecksFunctions =
     PartitionAllocFunctionsInternal<
         partition_alloc::AllocFlags::kNoHooks,
-        partition_alloc::FreeFlags::kZap |
+        partition_alloc::FreeFlags::kNoHooks |
+            partition_alloc::FreeFlags::kZap |
             partition_alloc::FreeFlags::kSchedulerLoopQuarantine>;
 
 // `PartitionAllocFunctions` in instantiated in cc file.
 extern template class PA_COMPONENT_EXPORT(ALLOCATOR_SHIM)
     PartitionAllocFunctionsInternal<partition_alloc::AllocFlags::kNoHooks,
-                                    partition_alloc::FreeFlags::kNone>;
+                                    partition_alloc::FreeFlags::kNoHooks>;
 // `PartitionAllocWithAdvancedChecksFunctions` in instantiated in cc file.
 extern template class PA_COMPONENT_EXPORT(ALLOCATOR_SHIM)
     PartitionAllocFunctionsInternal<
         partition_alloc::AllocFlags::kNoHooks,
-        partition_alloc::FreeFlags::kZap |
+        partition_alloc::FreeFlags::kNoHooks |
+            partition_alloc::FreeFlags::kZap |
             partition_alloc::FreeFlags::kSchedulerLoopQuarantine>;
 
 }  // namespace internal