Backed out changeset 1835ac58c617 (bug 1656515) for multiple perma failures on Linux 18.04 x64 asan. CLOSED TREE
authorRazvan Maries <rmaries@mozilla.com>
Tue, 11 Aug 2020 00:52:58 +0300
changeset 544183 3bfe3b28bf50c6ce1199b9e1d409b19f93047596
parent 544182 21f111df142672af13720c20eac6581a602fb62f
child 544184 cfbb9b48b70690f5b9d7bb8f18df2a4fabf2d049
push id123871
push userrmaries@mozilla.com
push dateMon, 10 Aug 2020 21:54:18 +0000
treeherderautoland@3bfe3b28bf50 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1656515
milestone81.0a1
backs out1835ac58c6174ae3a12fcb539a6b6de37667ad03
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1835ac58c617 (bug 1656515) for multiple perma failures on Linux 18.04 x64 asan. CLOSED TREE
intl/locale/LocaleService.cpp
--- a/intl/locale/LocaleService.cpp
+++ b/intl/locale/LocaleService.cpp
@@ -292,34 +292,22 @@ bool LocaleService::LanguagesMatch(const
 }
 
 bool LocaleService::IsServer() { return mIsServer; }
 
 static bool GetGREFileContents(const char* aFilePath, nsCString* aOutString) {
   // Look for the requested file in omnijar.
   RefPtr<CacheAwareZipReader> zip = Omnijar::GetReader(Omnijar::GRE);
   if (zip) {
-    const auto item = zip->GetItem(aFilePath);
-    if (!item) {
+    uint32_t length;
+    const uint8_t* data = zip->GetData(aFilePath, &length);
+    if (!data) {
       return false;
     }
-
-    MOZ_ASSERT(item->RealSize());
-
-    auto data = MakeUnique<uint8_t>(item->RealSize());
-    CacheAwareZipCursor cursor(item, zip, data.get(), item->RealSize());
-
-    uint32_t count;
-    cursor.Read(&count);
-
-    if (count != item->RealSize()) {
-      return false;
-    }
-
-    aOutString->Assign(reinterpret_cast<const char*>(data.get()), count);
+    aOutString->Assign(reinterpret_cast<const char*>(data), length);
     return true;
   }
 
   // If we didn't have an omnijar (i.e. we're running a non-packaged
   // build), then look in the GRE directory.
   nsCOMPtr<nsIFile> path;
   if (NS_FAILED(nsDirectoryService::gService->Get(
           NS_GRE_DIR, NS_GET_IID(nsIFile), getter_AddRefs(path)))) {