firebase · wilhuff · Oct 28, 2020 · Oct 27, 2020 · Oct 27, 2020 · Oct 27, 2020
diff --git a/Firestore/core/src/auth/user.cc b/Firestore/core/src/auth/user.cc
@@ -32,8 +32,8 @@ User::User(std::string uid) : uid_{std::move(uid)}, is_authenticated_{true} {
 }
 
 const User& User::Unauthenticated() {
-  static const User kUnauthenticated;
-  return kUnauthenticated;
+  static const User* kUnauthenticated = new User();
+  return *kUnauthenticated;
 }
 
 }  // namespace auth

diff --git a/Firestore/core/src/immutable/array_sorted_map.h b/Firestore/core/src/immutable/array_sorted_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -326,9 +326,11 @@ class ArraySortedMap : public SortedMapBase {
 
  private:
   static array_pointer EmptyArray() {
-    static const array_pointer kEmptyArray =
-        std::make_shared<const array_type>();
-    return kEmptyArray;
+    static const array_pointer* kEmptyArray = [] {
+      auto array = new array_type();
+      return new std::shared_ptr<const array_type>(array);
+    }();
+    return *kEmptyArray;
   }
 
   static array_pointer SortedArray(std::initializer_list<value_type> entries,

diff --git a/Firestore/core/src/immutable/llrb_node.h b/Firestore/core/src/immutable/llrb_node.h
@@ -162,18 +162,18 @@ class LlrbNode : public SortedMapBase {
    * Returns a shared Empty node, to cut down on allocations in the base case.
    */
   static const std::shared_ptr<Rep>& EmptyRep() {
-    static const std::shared_ptr<Rep> empty_rep = [] {
-      auto empty = std::make_shared<Rep>(Rep{std::pair<K, V>{}, Color::Black,
-                                             /* size= */ 0u, LlrbNode{nullptr},
-                                             LlrbNode{nullptr}});
+    static const std::shared_ptr<Rep>* empty_rep = [] {
+      auto rep = new Rep{std::pair<K, V>{}, Color::Black,
+                         /* size= */ 0u, LlrbNode{nullptr}, LlrbNode{nullptr}};
+      auto empty = new std::shared_ptr<Rep>{rep};
 
       // Set up the empty Rep such that you can traverse infinitely down left
       // and right links.
-      empty->left_.rep_ = empty;
-      empty->right_.rep_ = empty;
+      (*empty)->left_.rep_ = *empty;
+      (*empty)->right_.rep_ = *empty;
       return empty;
     }();
-    return empty_rep;
+    return *empty_rep;
   }
 
   /**

diff --git a/Firestore/core/src/local/leveldb_migrations.cc b/Firestore/core/src/local/leveldb_migrations.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 namespace firebase {
 namespace firestore {
 namespace local {
+namespace {
 
 using leveldb::Iterator;
 using leveldb::Slice;
@@ -44,8 +45,6 @@ using nanopb::Message;
 using nanopb::StringReader;
 using nanopb::Writer;
 
-namespace {
-
 /**
  * Schema version for the iOS client.
  *

diff --git a/Firestore/core/src/local/leveldb_transaction.cc b/Firestore/core/src/local/leveldb_transaction.cc
@@ -146,6 +146,7 @@ LevelDbTransaction::LevelDbTransaction(DB* db,
 }
 
 const ReadOptions& LevelDbTransaction::DefaultReadOptions() {
+  // ReadOptions is trivial so it does not need to be heap-allocated.
   static ReadOptions options = [] {
     ReadOptions read_options;
     read_options.verify_checksums = true;
@@ -155,6 +156,7 @@ const ReadOptions& LevelDbTransaction::DefaultReadOptions() {
 }
 
 const WriteOptions& LevelDbTransaction::DefaultWriteOptions() {
+  // WriteOptions is trivial so it does not need to be heap-allocated.
   static WriteOptions options;
   return options;
 }

diff --git a/Firestore/core/src/local/leveldb_util.cc b/Firestore/core/src/local/leveldb_util.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 namespace firebase {
 namespace firestore {
 namespace local {
-
 namespace {
 
 Error ConvertStatusCode(const leveldb::Status& status) {

diff --git a/Firestore/core/src/local/local_serializer.cc b/Firestore/core/src/local/local_serializer.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,6 @@
 namespace firebase {
 namespace firestore {
 namespace local {
-
 namespace {
 
 using core::Target;

diff --git a/Firestore/core/src/local/local_store.cc b/Firestore/core/src/local/local_store.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
 namespace firebase {
 namespace firestore {
 namespace local {
-
 namespace {
 
 using auth::User;

diff --git a/Firestore/core/src/local/target_data.cc b/Firestore/core/src/local/target_data.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 namespace firebase {
 namespace firestore {
 namespace local {
+namespace {
 
 using core::Target;
 using model::ListenSequenceNumber;
@@ -32,8 +33,6 @@ using nanopb::ByteString;
 
 // MARK: - QueryPurpose
 
-namespace {
-
 const char* ToString(QueryPurpose purpose) {
   switch (purpose) {
     case QueryPurpose::Listen:

diff --git a/Firestore/core/src/model/document_key.cc b/Firestore/core/src/model/document_key.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
 namespace firebase {
 namespace firestore {
 namespace model {
-
 namespace {
 
 void AssertValidPath(const ResourcePath& path) {
@@ -59,8 +58,8 @@ DocumentKey DocumentKey::FromSegments(std::initializer_list<std::string> list) {
 }
 
 const DocumentKey& DocumentKey::Empty() {
-  static const DocumentKey empty;
-  return empty;
+  static const DocumentKey* empty = new DocumentKey();
+  return *empty;
 }
 
 bool DocumentKey::IsDocumentKey(const ResourcePath& path) {

diff --git a/Firestore/core/src/model/field_path.cc b/Firestore/core/src/model/field_path.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,10 @@
 namespace firebase {
 namespace firestore {
 namespace model {
+namespace {
 
 using util::ThrowInvalidArgument;
 
-namespace {
-
 /**
  * True if the string could be used as a segment in a field path without
  * escaping. Valid identifies follow the regex [a-zA-Z_][a-zA-Z0-9_]*
@@ -79,6 +78,7 @@ struct JoinEscaped {
     out->append(escaped_segment(segment));
   }
 };
+
 }  // namespace
 
 constexpr const char* FieldPath::kDocumentKeyPath;

diff --git a/Firestore/core/src/model/field_value.cc b/Firestore/core/src/model/field_value.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@
 namespace firebase {
 namespace firestore {
 namespace model {
-
 namespace {
 
 using BaseValue = FieldValue::BaseValue;

diff --git a/Firestore/core/src/nanopb/pretty_printing.cc b/Firestore/core/src/nanopb/pretty_printing.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 namespace firebase {
 namespace firestore {
 namespace nanopb {
-
 namespace internal {
 
 std::string Indent(int level, int indent_width) {

diff --git a/Firestore/core/src/nanopb/writer.cc b/Firestore/core/src/nanopb/writer.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,13 +25,6 @@
 namespace firebase {
 namespace firestore {
 namespace nanopb {
-
-void Writer::Write(const pb_field_t fields[], const void* src_struct) {
-  if (!pb_encode(&stream_, fields, src_struct)) {
-    HARD_FAIL(PB_GET_ERROR(&stream_));
-  }
-}
-
 namespace {
 
 constexpr size_t kMinBufferSize = 4;
@@ -46,6 +39,12 @@ bool AppendToBytesArray(pb_ostream_t* stream,
 
 }  // namespace
 
+void Writer::Write(const pb_field_t fields[], const void* src_struct) {
+  if (!pb_encode(&stream_, fields, src_struct)) {
+    HARD_FAIL(PB_GET_ERROR(&stream_));
+  }
+}
+
 ByteStringWriter::ByteStringWriter() {
   stream_.callback = AppendToBytesArray;
   stream_.state = this;

diff --git a/Firestore/core/src/remote/datastore.cc b/Firestore/core/src/remote/datastore.cc
@@ -82,8 +82,8 @@ void LogGrpcCallFinished(absl::string_view rpc_name,
             status.error_message());
   if (LogIsDebugEnabled()) {
     auto headers =
-        Datastore::GetWhitelistedHeadersAsString(call->GetResponseHeaders());
-    LOG_DEBUG("RPC %s returned headers (whitelisted): %s", rpc_name, headers);
+        Datastore::GetAllowlistedHeadersAsString(call->GetResponseHeaders());
+    LOG_DEBUG("RPC %s returned headers (allowlisted): %s", rpc_name, headers);
   }
 }
 
@@ -332,15 +332,16 @@ bool Datastore::IsPermanentWriteError(const Status& error) {
   return IsPermanentError(error) && !IsAbortedError(error);
 }
 
-std::string Datastore::GetWhitelistedHeadersAsString(
+std::string Datastore::GetAllowlistedHeadersAsString(
     const GrpcCall::Metadata& headers) {
-  static std::unordered_set<std::string> whitelist = {
+  static auto* allowlist = new std::unordered_set<std::string>{
       "date", "x-google-backends", "x-google-netmon-label", "x-google-service",
       "x-google-gfe-request-trace"};
 
   std::string result;
+  auto end = allowlist->end();
   for (const auto& kv : headers) {
-    if (whitelist.find(MakeString(kv.first)) != whitelist.end()) {
+    if (allowlist->find(MakeString(kv.first)) != end) {
       absl::StrAppend(&result, MakeStringView(kv.first), ": ",
                       MakeStringView(kv.second), "\n");
     }

diff --git a/Firestore/core/src/remote/datastore.h b/Firestore/core/src/remote/datastore.h
@@ -123,7 +123,7 @@ class Datastore : public std::enable_shared_from_this<Datastore> {
    */
   static bool IsPermanentWriteError(const util::Status& status);
 
-  static std::string GetWhitelistedHeadersAsString(
+  static std::string GetAllowlistedHeadersAsString(
       const GrpcCall::Metadata& headers);
 
   Datastore(const Datastore& other) = delete;
@@ -169,7 +169,7 @@ class Datastore : public std::enable_shared_from_this<Datastore> {
 
   void RemoveGrpcCall(GrpcCall* to_remove);
 
-  static GrpcCall::Metadata ExtractWhitelistedHeaders(
+  static GrpcCall::Metadata ExtractAllowlistedHeaders(
       const GrpcCall::Metadata& headers);
 
   // In case Auth tries to invoke a callback after `Datastore` has been shut

diff --git a/Firestore/core/src/remote/firebase_metadata_provider_apple.mm b/Firestore/core/src/remote/firebase_metadata_provider_apple.mm
@@ -27,7 +27,6 @@
 namespace firebase {
 namespace firestore {
 namespace remote {
-
 namespace {
 
 using util::MakeString;

diff --git a/Firestore/core/src/remote/grpc_connection.cc b/Firestore/core/src/remote/grpc_connection.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ SUPPRESS_END()
 namespace firebase {
 namespace firestore {
 namespace remote {
+namespace {
 
 using auth::Token;
 using core::DatabaseInfo;
@@ -55,8 +56,6 @@ using util::Status;
 using util::StatusOr;
 using util::StringFormat;
 
-namespace {
-
 const char* const kAuthorizationHeader = "authorization";
 const char* const kXGoogApiClientHeader = "x-goog-api-client";
 const char* const kGoogleCloudResourcePrefix = "google-cloud-resource-prefix";
@@ -125,8 +124,8 @@ class HostConfigMap {
 };
 
 HostConfigMap& Config() {
-  static HostConfigMap config_by_host;
-  return config_by_host;
+  static auto* config_by_host = new HostConfigMap();
+  return *config_by_host;
 }
 
 std::string GetCppLanguageToken() {
@@ -170,8 +169,8 @@ class ClientLanguageToken {
 };
 
 ClientLanguageToken& LanguageToken() {
-  static ClientLanguageToken token;
-  return token;
+  static auto* token = new ClientLanguageToken();
+  return *token;
 }
 
 void AddCloudApiHeader(grpc::ClientContext& context) {