Mark many more base/ accessors as lifetime bound

Bug: 375244062
Change-Id: I8aabba49af73c64f282e51e7ae99d036274f16b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5959167
Commit-Queue: Tom Sepez <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1374042}


CrOS-Libchrome-Original-Commit: 04e98bf9e13012fda48001096174a4500ff27866

Author: tsepez

base/containers/intrusive_heap.h

@@ -729,8 +729,8 @@ class WithHeapHandle : public InternalHeapHandleStorage {
   WithHeapHandle& operator=(const WithHeapHandle&) = delete;
   WithHeapHandle& operator=(WithHeapHandle&& other) = default;
 
-  T& value() { return value_; }
-  const T& value() const { return value_; }
+  T& value() LIFETIME_BOUND { return value_; }
+  const T& value() const LIFETIME_BOUND { return value_; }
 
   // Utility functions.
   void swap(WithHeapHandle& other) noexcept;

base/debug/allocation_trace.h

@@ -66,7 +66,7 @@ class BASE_EXPORT OperationRecord {
   // Number of allocated bytes. Returns 0 for free operations.
   size_t GetSize() const;
   // The stacktrace as taken by the Initialize*-functions.
-  const StackTraceContainer& GetStackTrace() const;
+  const StackTraceContainer& GetStackTrace() const LIFETIME_BOUND;
 
   // Initialize the record with data for another operation. Data from any
   // previous operation will be silently overwritten. These functions are

base/files/file_path.h

@@ -109,6 +109,7 @@
 #include <vector>
 
 #include "base/base_export.h"
+#include "base/compiler_specific.h"
 #include "base/trace_event/base_tracing_forward.h"
 #include "build/build_config.h"
 
@@ -217,7 +218,7 @@ class BASE_EXPORT FilePath {
     return path_ < that.path_;
   }
 
-  const StringType& value() const { return path_; }
+  const StringType& value() const LIFETIME_BOUND { return path_; }
 
   [[nodiscard]] bool empty() const { return path_.empty(); }
 

base/files/important_file_writer.h

@@ -11,6 +11,7 @@
 #include <string_view>
 
 #include "base/base_export.h"
+#include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
@@ -103,7 +104,7 @@ class BASE_EXPORT ImportantFileWriter {
   // of destruction.
   ~ImportantFileWriter();
 
-  const FilePath& path() const { return path_; }
+  const FilePath& path() const LIFETIME_BOUND { return path_; }
 
   // Returns true if there is a scheduled write pending which has not yet
   // been started.
@@ -155,10 +156,12 @@ class BASE_EXPORT ImportantFileWriter {
   }
 
  private:
-  const OneShotTimer& timer() const {
+  const OneShotTimer& timer() const LIFETIME_BOUND {
+    return timer_override_ ? *timer_override_ : timer_;
+  }
+  OneShotTimer& timer() LIFETIME_BOUND {
     return timer_override_ ? *timer_override_ : timer_;
   }
-  OneShotTimer& timer() { return timer_override_ ? *timer_override_ : timer_; }
 
   // Same as WriteNow() but it uses a promise-like signature that allows running
   // custom logic in the background sequence.

base/files/safe_base_name.h

@@ -8,6 +8,7 @@
 #include <optional>
 
 #include "base/base_export.h"
+#include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 
 namespace base {
@@ -30,11 +31,13 @@ class BASE_EXPORT SafeBaseName {
 
   // Same as above, but takes a StringPieceType for convenience.
   static std::optional<SafeBaseName> Create(FilePath::StringPieceType);
-  const FilePath& path() const { return path_; }
+  const FilePath& path() const LIFETIME_BOUND { return path_; }
 
   // Convenience functions.
   const std::string AsUTF8Unsafe() const { return path_.AsUTF8Unsafe(); }
-  const FilePath::StringType& value() const { return path_.value(); }
+  const FilePath::StringType& value() const LIFETIME_BOUND {
+    return path_.value();
+  }
   [[nodiscard]] bool empty() const { return path_.empty(); }
 
   bool operator==(const SafeBaseName& that) const;

base/files/scoped_temp_dir.h

@@ -18,6 +18,7 @@
 // intervening calls to Delete or Take, or the calls will fail.
 
 #include "base/base_export.h"
+#include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 
 namespace base {
@@ -53,7 +54,7 @@ class BASE_EXPORT ScopedTempDir {
 
   // Returns the path to the created directory. Call one of the
   // CreateUniqueTempDir* methods before getting the path.
-  const FilePath& GetPath() const;
+  const FilePath& GetPath() const LIFETIME_BOUND;
 
   // Returns true if path_ is non-empty and exists.
   bool IsValid() const;

base/memory/discardable_shared_memory.h

@@ -8,6 +8,7 @@
 #include <stddef.h>
 
 #include "base/base_export.h"
+#include "base/compiler_specific.h"
 #include "base/containers/span.h"
 #include "base/dcheck_is_on.h"
 #include "base/memory/shared_memory_mapping.h"
@@ -91,7 +92,7 @@ class BASE_EXPORT DiscardableSharedMemory {
   // Returns an ID for the shared memory region. This is ID of the mapped region
   // consistent across all processes and is valid as long as the region is not
   // unmapped.
-  const UnguessableToken& mapped_id() const {
+  const UnguessableToken& mapped_id() const LIFETIME_BOUND {
     return shared_memory_mapping_.guid();
   }
 

base/memory/platform_shared_memory_region.h

@@ -10,6 +10,7 @@
 #include <optional>
 
 #include "base/base_export.h"
+#include "base/compiler_specific.h"
 #include "base/containers/span.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/platform_shared_memory_handle.h"
@@ -203,7 +204,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
   // created by calling |MapAt()| above.
   static void Unmap(span<uint8_t> mapping, SharedMemoryMapper* mapper);
 
-  const UnguessableToken& GetGUID() const { return guid_; }
+  const UnguessableToken& GetGUID() const LIFETIME_BOUND { return guid_; }
 
   size_t GetSize() const { return size_; }
 

base/memory/protected_memory.h

@@ -85,6 +85,7 @@
 #include "base/bits.h"
 #include "base/check.h"
 #include "base/check_op.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/page_size.h"
 #include "base/memory/protected_memory_buildflags.h"
@@ -191,8 +192,8 @@ class ProtectedDataHolder {
  public:
   consteval ProtectedDataHolder() = default;
 
-  T& GetReference() { return *GetPointer(); }
-  const T& GetReference() const { return *GetPointer(); }
+  T& GetReference() LIFETIME_BOUND { return *GetPointer(); }
+  const T& GetReference() const LIFETIME_BOUND { return *GetPointer(); }
 
   T* GetPointer() {
     CHECK(constructed_);

base/memory/read_only_shared_memory_region.h

@@ -5,14 +5,15 @@
 #ifndef BASE_MEMORY_READ_ONLY_SHARED_MEMORY_REGION_H_
 #define BASE_MEMORY_READ_ONLY_SHARED_MEMORY_REGION_H_
 
+#include <stdint.h>
+
 #include "base/base_export.h"
 #include "base/check.h"
 #include "base/check_op.h"
+#include "base/compiler_specific.h"
 #include "base/memory/platform_shared_memory_region.h"
 #include "base/memory/shared_memory_mapping.h"
 
-#include <stdint.h>
-
 namespace base {
 
 struct MappedReadOnlyRegion;
@@ -107,7 +108,7 @@ class BASE_EXPORT ReadOnlySharedMemoryRegion {
   }
 
   // Returns 128-bit GUID of the region.
-  const UnguessableToken& GetGUID() const {
+  const UnguessableToken& GetGUID() const LIFETIME_BOUND {
     DCHECK(IsValid());
     return handle_.GetGUID();
   }