Title: [282939] branches/safari-612-branch/Source/bmalloc
Revision
282939
Author
repst...@apple.com
Date
2021-09-22 22:14:14 -0700 (Wed, 22 Sep 2021)

Log Message

Cherry-pick r282561. rdar://problem/83430086

    Stub out the footprint() API when libpas is in use
    https://bugs.webkit.org/show_bug.cgi?id=230362

    Reviewed by Yusuke Suzuki.

    The Gigacage's footprint API is called from some test-only code in JSC, evidently to no
    meaningful effect. It's possible for libpas to support such an API but it currently
    doesn't. So, stub it out. To my knowledge we don't actually use this API for anything
    other than tests, and even tests seem to use it only in the sense that they expect to be
    able to call it without crashing.

    * bmalloc/Gigacage.cpp:
    (Gigacage::footprint):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282561 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-612-branch/Source/bmalloc/ChangeLog (282938 => 282939)


--- branches/safari-612-branch/Source/bmalloc/ChangeLog	2021-09-23 05:14:11 UTC (rev 282938)
+++ branches/safari-612-branch/Source/bmalloc/ChangeLog	2021-09-23 05:14:14 UTC (rev 282939)
@@ -1,5 +1,43 @@
 2021-09-22  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r282561. rdar://problem/83430086
+
+    Stub out the footprint() API when libpas is in use
+    https://bugs.webkit.org/show_bug.cgi?id=230362
+    
+    Reviewed by Yusuke Suzuki.
+    
+    The Gigacage's footprint API is called from some test-only code in JSC, evidently to no
+    meaningful effect. It's possible for libpas to support such an API but it currently
+    doesn't. So, stub it out. To my knowledge we don't actually use this API for anything
+    other than tests, and even tests seem to use it only in the sense that they expect to be
+    able to call it without crashing.
+    
+    * bmalloc/Gigacage.cpp:
+    (Gigacage::footprint):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282561 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-16  Filip Pizlo  <fpi...@apple.com>
+
+            Stub out the footprint() API when libpas is in use
+            https://bugs.webkit.org/show_bug.cgi?id=230362
+
+            Reviewed by Yusuke Suzuki.
+
+            The Gigacage's footprint API is called from some test-only code in JSC, evidently to no
+            meaningful effect. It's possible for libpas to support such an API but it currently
+            doesn't. So, stub it out. To my knowledge we don't actually use this API for anything
+            other than tests, and even tests seem to use it only in the sense that they expect to be
+            able to call it without crashing.
+
+            * bmalloc/Gigacage.cpp:
+            (Gigacage::footprint):
+
+2021-09-22  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r282556. rdar://problem/83430136
 
     [libpas] Update to 38b9b0b92ccc9628627c742523de6200acc08211 and fully enable on AS

Modified: branches/safari-612-branch/Source/bmalloc/bmalloc/Gigacage.cpp (282938 => 282939)


--- branches/safari-612-branch/Source/bmalloc/bmalloc/Gigacage.cpp	2021-09-23 05:14:11 UTC (rev 282938)
+++ branches/safari-612-branch/Source/bmalloc/bmalloc/Gigacage.cpp	2021-09-23 05:14:14 UTC (rev 282939)
@@ -323,7 +323,12 @@
 
 size_t footprint(Kind kind)
 {
+#if BUSE(LIBPAS)
+    BUNUSED(kind);
+    return 0;
+#else
     return PerProcess<PerHeapKind<Heap>>::get()->at(heapKind(kind)).footprint();
+#endif
 }
 
 } // namespace Gigacage
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to