[vm] Fix some Google3 ClangTidy warnings.

rmacnak-google · Commit Queue · commit b0fd6d4a15b4 · 2025-06-09T11:05:59.000-07:00
TEST=google3 Change-Id: I23236f32d78920388c0b7d2beb738e7cec965226 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433580 Reviewed-by: Alexander Aprelev <aam@google.com> Commit-Queue: Ryan Macnak <rmacnak@google.com>
diff --git a/runtime/bin/macho_loader.cc b/runtime/bin/macho_loader.cc
@@ -539,7 +539,7 @@ DART_EXPORT Dart_LoadedMachODylib* Dart_LoadMachODylib_Memory(
     return nullptr;
   }
   std::unique_ptr<LoadedMachODylib> macho(
-      new LoadedMachODylib(std::move(mappable), /*file_offset=*/0));
+      new LoadedMachODylib(std::move(mappable), /*macho_data_offset=*/0));
 
   if (!macho->Load() ||
       !macho->ResolveSymbols(vm_snapshot_data, vm_snapshot_instrs,
diff --git a/runtime/vm/app_snapshot.cc b/runtime/vm/app_snapshot.cc
@@ -248,6 +248,7 @@ class DeserializationCluster : public ZoneAllocated {
 
   const char* name() const { return name_; }
   bool is_canonical() const { return is_canonical_; }
+  bool is_immutable() const { return is_immutable_; }
 
  protected:
   void ReadAllocFixedSize(Deserializer* deserializer, intptr_t instance_size);
@@ -4555,8 +4556,9 @@ class AbstractInstanceDeserializationCluster : public DeserializationCluster {
  protected:
   explicit AbstractInstanceDeserializationCluster(const char* name,
                                                   bool is_canonical,
+                                                  bool is_immutable,
                                                   bool is_root_unit)
-      : DeserializationCluster(name, is_canonical),
+      : DeserializationCluster(name, is_canonical, is_immutable),
         is_root_unit_(is_root_unit) {}
 
   const bool is_root_unit_;
@@ -4587,9 +4589,9 @@ class InstanceDeserializationCluster
                                           bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Instance",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit),
-        cid_(cid),
-        is_immutable_(is_immutable) {}
+        cid_(cid) {}
   ~InstanceDeserializationCluster() {}
 
   void ReadAlloc(Deserializer* d) override {
@@ -4647,7 +4649,6 @@ class InstanceDeserializationCluster
 
  private:
   const intptr_t cid_;
-  const bool is_immutable_;
   intptr_t next_field_offset_in_words_;
   intptr_t instance_size_in_words_;
 };
@@ -5247,9 +5248,12 @@ class ClosureSerializationCluster : public SerializationCluster {
 class ClosureDeserializationCluster
     : public AbstractInstanceDeserializationCluster {
  public:
-  explicit ClosureDeserializationCluster(bool is_canonical, bool is_root_unit)
+  explicit ClosureDeserializationCluster(bool is_canonical,
+                                         bool is_immutable,
+                                         bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Closure",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit) {}
   ~ClosureDeserializationCluster() {}
 
@@ -5342,9 +5346,12 @@ class MintSerializationCluster : public SerializationCluster {
 class MintDeserializationCluster
     : public AbstractInstanceDeserializationCluster {
  public:
-  explicit MintDeserializationCluster(bool is_canonical, bool is_root_unit)
+  explicit MintDeserializationCluster(bool is_canonical,
+                                      bool is_immutable,
+                                      bool is_root_unit)
       : AbstractInstanceDeserializationCluster("int",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit) {}
   ~MintDeserializationCluster() {}
 
@@ -5411,10 +5418,15 @@ class DoubleSerializationCluster : public SerializationCluster {
 class DoubleDeserializationCluster
     : public AbstractInstanceDeserializationCluster {
  public:
-  explicit DoubleDeserializationCluster(bool is_canonical, bool is_root_unit)
+  explicit DoubleDeserializationCluster(bool is_canonical,
+                                        bool is_immutable,
+                                        bool is_root_unit)
       : AbstractInstanceDeserializationCluster("double",
                                                is_canonical,
-                                               is_root_unit) {}
+                                               is_immutable,
+                                               is_root_unit) {
+    ASSERT(Object::ShouldHaveImmutabilityBitSet(kDoubleCid));
+  }
   ~DoubleDeserializationCluster() {}
 
   void ReadAlloc(Deserializer* d) override {
@@ -5481,9 +5493,11 @@ class Simd128DeserializationCluster
  public:
   explicit Simd128DeserializationCluster(intptr_t cid,
                                          bool is_canonical,
+                                         bool is_immutable,
                                          bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Simd128",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit),
         cid_(cid) {}
   ~Simd128DeserializationCluster() {}
@@ -5626,9 +5640,12 @@ class RecordSerializationCluster : public SerializationCluster {
 class RecordDeserializationCluster
     : public AbstractInstanceDeserializationCluster {
  public:
-  explicit RecordDeserializationCluster(bool is_canonical, bool is_root_unit)
+  explicit RecordDeserializationCluster(bool is_canonical,
+                                        bool is_immutable,
+                                        bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Record",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit) {}
   ~RecordDeserializationCluster() {}
 
@@ -6261,9 +6278,11 @@ class MapDeserializationCluster
  public:
   explicit MapDeserializationCluster(intptr_t cid,
                                      bool is_canonical,
+                                     bool is_immutable,
                                      bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Map",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit),
         cid_(cid) {}
   ~MapDeserializationCluster() {}
@@ -6336,9 +6355,11 @@ class SetDeserializationCluster
  public:
   explicit SetDeserializationCluster(intptr_t cid,
                                      bool is_canonical,
+                                     bool is_immutable,
                                      bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Set",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit),
         cid_(cid) {}
   ~SetDeserializationCluster() {}
@@ -6476,9 +6497,11 @@ class ArrayDeserializationCluster
  public:
   explicit ArrayDeserializationCluster(intptr_t cid,
                                        bool is_canonical,
+                                       bool is_immutable,
                                        bool is_root_unit)
       : AbstractInstanceDeserializationCluster("Array",
                                                is_canonical,
+                                               is_immutable,
                                                is_root_unit),
         cid_(cid) {}
   ~ArrayDeserializationCluster() {}
@@ -9120,25 +9143,25 @@ DeserializationCluster* Deserializer::ReadCluster() {
       return new (Z)
           TypeParameterDeserializationCluster(is_canonical, !is_non_root_unit_);
     case kClosureCid:
-      return new (Z)
-          ClosureDeserializationCluster(is_canonical, !is_non_root_unit_);
+      return new (Z) ClosureDeserializationCluster(is_canonical, is_immutable,
+                                                   !is_non_root_unit_);
     case kMintCid:
-      return new (Z)
-          MintDeserializationCluster(is_canonical, !is_non_root_unit_);
+      return new (Z) MintDeserializationCluster(is_canonical, is_immutable,
+                                                !is_non_root_unit_);
     case kDoubleCid:
-      return new (Z)
-          DoubleDeserializationCluster(is_canonical, !is_non_root_unit_);
+      return new (Z) DoubleDeserializationCluster(is_canonical, is_immutable,
+                                                  !is_non_root_unit_);
     case kInt32x4Cid:
     case kFloat32x4Cid:
     case kFloat64x2Cid:
-      return new (Z)
-          Simd128DeserializationCluster(cid, is_canonical, !is_non_root_unit_);
+      return new (Z) Simd128DeserializationCluster(
+          cid, is_canonical, is_immutable, !is_non_root_unit_);
     case kGrowableObjectArrayCid:
       ASSERT(!is_canonical);
       return new (Z) GrowableObjectArrayDeserializationCluster();
     case kRecordCid:
-      return new (Z)
-          RecordDeserializationCluster(is_canonical, !is_non_root_unit_);
+      return new (Z) RecordDeserializationCluster(is_canonical, is_immutable,
+                                                  !is_non_root_unit_);
     case kStackTraceCid:
       ASSERT(!is_canonical);
       return new (Z) StackTraceDeserializationCluster();
@@ -9152,20 +9175,20 @@ DeserializationCluster* Deserializer::ReadCluster() {
       // We do not have mutable hash maps in snapshots.
       UNREACHABLE();
     case kConstMapCid:
-      return new (Z) MapDeserializationCluster(kConstMapCid, is_canonical,
-                                               !is_non_root_unit_);
+      return new (Z) MapDeserializationCluster(
+          kConstMapCid, is_canonical, is_immutable, !is_non_root_unit_);
     case kSetCid:
       // We do not have mutable hash sets in snapshots.
       UNREACHABLE();
     case kConstSetCid:
-      return new (Z) SetDeserializationCluster(kConstSetCid, is_canonical,
-                                               !is_non_root_unit_);
+      return new (Z) SetDeserializationCluster(
+          kConstSetCid, is_canonical, is_immutable, !is_non_root_unit_);
     case kArrayCid:
-      return new (Z) ArrayDeserializationCluster(kArrayCid, is_canonical,
-                                                 !is_non_root_unit_);
+      return new (Z) ArrayDeserializationCluster(
+          kArrayCid, is_canonical, is_immutable, !is_non_root_unit_);
     case kImmutableArrayCid:
       return new (Z) ArrayDeserializationCluster(
-          kImmutableArrayCid, is_canonical, !is_non_root_unit_);
+          kImmutableArrayCid, is_canonical, is_immutable, !is_non_root_unit_);
     case kWeakArrayCid:
       return new (Z) WeakArrayDeserializationCluster();
     case kStringCid:
diff --git a/runtime/vm/elf.cc b/runtime/vm/elf.cc
@@ -1174,7 +1174,6 @@ void ElfWriter::CreateBSS() {
     } else {
       // Not VM or isolate text.
       UNREACHABLE();
-      continue;
     }
 
     uint8_t* bytes = nullptr;

Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ DART_EXPORT Dart_LoadedMachODylib* Dart_LoadMachODylib_Memory(`
`539`	`539`	`return nullptr;`
`540`	`540`	`}`
`541`	`541`	`std::unique_ptr<LoadedMachODylib> macho(`
`542`		`- new LoadedMachODylib(std::move(mappable), /file_offset=/0));`
	`542`	`+ new LoadedMachODylib(std::move(mappable), /macho_data_offset=/0));`
`543`	`543`
`544`	`544`	`if (!macho->Load() \|\|`
`545`	`545`	`!macho->ResolveSymbols(vm_snapshot_data, vm_snapshot_instrs,`
Original file line number	Diff line number	Diff line change
`@@ -1174,7 +1174,6 @@ void ElfWriter::CreateBSS() {`
`1174`	`1174`	`} else {`
`1175`	`1175`	`// Not VM or isolate text.`
`1176`	`1176`	`UNREACHABLE();`
`1177`		`- continue;`
`1178`	`1177`	`}`
`1179`	`1178`
`1180`	`1179`	`uint8_t* bytes = nullptr;`