Browse Source

fix queue

Frank-Rainer Grahl 10 months ago
parent
commit
063c13e10e

+ 1 - 24
frg/mozilla-release/work-js/TOP-NOBUG-REGEXP-46-fixes-25318.patch

@@ -1,11 +1,10 @@
 # HG changeset patch
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Date 1690631530 -7200
 # Date 1690631530 -7200
-# Parent  0d44311d166f759f6b08ea02cd62ed574c90d998
+# Parent  1909f65e1651d5d02e7c0f5d283563b535ba11f8
 No Bug - Switch to new regexp V8 engine additional fixes. r=frg a=frg
 No Bug - Switch to new regexp V8 engine additional fixes. r=frg a=frg
 
 
 Fix x86 build and do not require turning on c++17 right now.
 Fix x86 build and do not require turning on c++17 right now.
-Do not require Bug 1468406 part 4 nonCCWRealm
 
 
 diff --git a/js/src/irregexp/RegExpAPI.cpp b/js/src/irregexp/RegExpAPI.cpp
 diff --git a/js/src/irregexp/RegExpAPI.cpp b/js/src/irregexp/RegExpAPI.cpp
 --- a/js/src/irregexp/RegExpAPI.cpp
 --- a/js/src/irregexp/RegExpAPI.cpp
@@ -138,28 +137,6 @@ diff --git a/js/src/irregexp/util/ZoneShim.h b/js/src/irregexp/util/ZoneShim.h
      capacity_ = new_capacity;
      capacity_ = new_capacity;
    }
    }
  
  
-diff --git a/js/src/vm/ObjectGroup.cpp b/js/src/vm/ObjectGroup.cpp
---- a/js/src/vm/ObjectGroup.cpp
-+++ b/js/src/vm/ObjectGroup.cpp
-@@ -317,17 +317,17 @@ JSObject::makeLazyGroup(JSContext* cx, H
- 
-     if (obj->isNative() && obj->as<NativeObject>().isIndexed())
-         initialFlags |= OBJECT_FLAG_SPARSE_INDEXES;
- 
-     if (obj->is<ArrayObject>() && obj->as<ArrayObject>().length() > INT32_MAX)
-         initialFlags |= OBJECT_FLAG_LENGTH_OVERFLOW;
- 
-     Rooted<TaggedProto> proto(cx, obj->taggedProto());
--    ObjectGroup* group = ObjectGroupRealm::makeGroup(cx, obj->nonCCWRealm(), obj->getClass(),
-+    ObjectGroup* group = ObjectGroupRealm::makeGroup(cx, obj->realm(), obj->getClass(),
-                                                      proto, initialFlags);
-     if (!group)
-         return nullptr;
- 
-     AutoEnterAnalysis enter(cx);
- 
-     /* Fill in the type according to the state of this object. */
- 
 diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h
 diff --git a/js/src/vm/RegExpShared.h b/js/src/vm/RegExpShared.h
 --- a/js/src/vm/RegExpShared.h
 --- a/js/src/vm/RegExpShared.h
 +++ b/js/src/vm/RegExpShared.h
 +++ b/js/src/vm/RegExpShared.h

+ 0 - 28
frg/mozilla-release/work-js/fixit.patch

@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Frank-Rainer Grahl <frgrahl@gmx.net>
-# Date 1702930426 -3600
-# Parent  69ac27c69fc6b15b4b9840d1df166f784a1357c3
-fix patch
-
-diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
---- a/js/xpconnect/src/XPCJSRuntime.cpp
-+++ b/js/xpconnect/src/XPCJSRuntime.cpp
-@@ -2247,17 +2247,17 @@ class XPCJSRuntimeStats : public JS::Run
-         xpc::ZoneStatsExtras* extras = new xpc::ZoneStatsExtras;
-         extras->pathPrefix.AssignLiteral("explicit/js-non-window/zones/");
- 
-         // Get some global in this zone.
-         Rooted<Realm*> realm(cx, js::GetAnyRealmInZone(zone));
-         if (realm) {
-             RootedObject global(cx, JS::GetRealmGlobalOrNull(realm));
-             if (global) {
--                RefPtr<nsGlobalWindowInner> window;
-+                RefPtr<nsGlobalWindow> window;
-                 if (NS_SUCCEEDED(UNWRAP_OBJECT(Window, global, window))) {
-                     // The global is a |window| object.  Use the path prefix that
-                     // we should have already created for it.
-                     if (mTopWindowPaths->Get(window->WindowID(),
-                                              &extras->pathPrefix))
-                         extras->pathPrefix.AppendLiteral("/js-");
-                 }
-             }

+ 0 - 1
frg/mozilla-release/work-js/series

@@ -6778,7 +6778,6 @@ TOP-NOBUG-REGEXP-43-1691184-88a1-25318.patch
 TOP-NOBUG-REGEXP-44-irregexp-25318.patch
 TOP-NOBUG-REGEXP-44-irregexp-25318.patch
 TOP-NOBUG-REGEXP-45-final-25318.patch
 TOP-NOBUG-REGEXP-45-final-25318.patch
 TOP-NOBUG-REGEXP-46-fixes-25318.patch
 TOP-NOBUG-REGEXP-46-fixes-25318.patch
-fixit.patch
 
 
 bumm-compile-error
 bumm-compile-error
 L-1462261-1-62a1.patch
 L-1462261-1-62a1.patch