[webkit-changes] [295570] trunk/Source/bmalloc/libpas/src/libpas

Wed, 15 Jun 2022 13:21:52 -0700

Title: [295570] trunk/Source/bmalloc/libpas/src/libpas
Revision
295570
Author
brandonstew...@apple.com
Date
2022-06-15 13:20:53 -0700 (Wed, 15 Jun 2022)

Log Message

[libpas] fix build with pas_assertion_failed and type conversion
https://bugs.webkit.org/show_bug.cgi?id=241640

Reviewed by Mark Lam.

Build fix.

* Source/bmalloc/libpas/src/libpas/pas_utils.c:
(pas_report_assertion_failed):
(pas_assertion_failed): Deleted.
* Source/bmalloc/libpas/src/libpas/pas_utils.h:
(pas_assertion_failed):
(pas_assertion_failed_noreturn_silencer1):
(pas_assertion_failed_noreturn_silencer2):
(pas_assertion_failed_noreturn_silencer3):
(pas_assertion_failed_noreturn_silencer4):
(pas_assertion_failed_noreturn_silencer5):
(pas_assertion_failed_noreturn_silencer6):

Canonical link: https://commits.webkit.org/251575@main

Modified Paths

Diff

Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_utils.c (295569 => 295570)


--- trunk/Source/bmalloc/libpas/src/libpas/pas_utils.c	2022-06-15 19:59:57 UTC (rev 295569)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_utils.c	2022-06-15 20:20:53 UTC (rev 295570)
@@ -171,11 +171,6 @@
     pas_log("[%d] pas panic: ", getpid());
     pas_log("%s:%d: %s: assertion %s failed.\n", filename, line, function, _expression_);
 }
-
-void pas_assertion_failed(const char* filename, int line, const char* function, const char* _expression_)
-{
-    pas_panic("%s:%d: %s: assertion %s failed.\n", filename, line, function, _expression_);
-}
 #endif /* PAS_ENABLE_TESTING */
 
 void pas_assertion_failed_no_inline(const char* filename, int line, const char* function, const char* _expression_)

Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h (295569 => 295570)


--- trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h	2022-06-15 19:59:57 UTC (rev 295569)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h	2022-06-15 20:20:53 UTC (rev 295570)
@@ -218,8 +218,10 @@
 #else /* PAS_OS(DARWIN) */
 
 #if PAS_ENABLE_TESTING
-PAS_API PAS_NO_RETURN void pas_assertion_failed(
-    const char* filename, int line, const char* function, const char* _expression_);
+PAS_API PAS_NO_RETURN void pas_assertion_failed(const char* filename, int line, const char* function, const char* _expression_)
+{
+    pas_panic("%s:%d: %s: assertion %s failed.\n", filename, line, function, _expression_);
+}
 #else /* PAS_ENABLE_TESTING -> so !PAS_ENABLE_TESTING */
 static PAS_ALWAYS_INLINE PAS_NO_RETURN void pas_assertion_failed(
     const char* filename, int line, const char* function, const char* _expression_)
@@ -276,7 +278,7 @@
     const char* filename, int line, const char* function, const char* _expression_, uint64_t misc1)
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, _expression_);
-    pas_crash_with_info_impl1(line, misc1);
+    pas_crash_with_info_impl1((uint64_t)line, misc1);
 }
 
 static PAS_ALWAYS_INLINE void pas_assertion_failed_noreturn_silencer2(
@@ -283,7 +285,7 @@
     const char* filename, int line, const char* function, const char* _expression_, uint64_t misc1, uint64_t misc2)
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, _expression_);
-    pas_crash_with_info_impl2(line, misc1, misc2);
+    pas_crash_with_info_impl2((uint64_t)line, misc1, misc2);
 }
 
 static PAS_ALWAYS_INLINE void pas_assertion_failed_noreturn_silencer3(
@@ -290,7 +292,7 @@
     const char* filename, int line, const char* function, const char* _expression_, uint64_t misc1, uint64_t misc2, uint64_t misc3)
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, _expression_);
-    pas_crash_with_info_impl3(line, misc1, misc2, misc3);
+    pas_crash_with_info_impl3((uint64_t)line, misc1, misc2, misc3);
 }
 
 static PAS_ALWAYS_INLINE void pas_assertion_failed_noreturn_silencer4(
@@ -297,7 +299,7 @@
     const char* filename, int line, const char* function, const char* _expression_, uint64_t misc1, uint64_t misc2, uint64_t misc3, uint64_t misc4)
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, _expression_);
-    pas_crash_with_info_impl4(line, misc1, misc2, misc3, misc4);
+    pas_crash_with_info_impl4((uint64_t)line, misc1, misc2, misc3, misc4);
 }
 
 static PAS_ALWAYS_INLINE void pas_assertion_failed_noreturn_silencer5(
@@ -304,7 +306,7 @@
     const char* filename, int line, const char* function, const char* _expression_, uint64_t misc1, uint64_t misc2, uint64_t misc3, uint64_t misc4, uint64_t misc5)
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, _expression_);
-    pas_crash_with_info_impl5(line, misc1, misc2, misc3, misc4, misc5);
+    pas_crash_with_info_impl5((uint64_t)line, misc1, misc2, misc3, misc4, misc5);
 }
 
 static PAS_ALWAYS_INLINE void pas_assertion_failed_noreturn_silencer6(
@@ -311,7 +313,7 @@
     const char* filename, int line, const char* function, const char* _expression_, uint64_t misc1, uint64_t misc2, uint64_t misc3, uint64_t misc4, uint64_t misc5, uint64_t misc6)
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, _expression_);
-    pas_crash_with_info_impl6(line, misc1, misc2, misc3, misc4, misc5, misc6);
+    pas_crash_with_info_impl6((uint64_t)line, misc1, misc2, misc3, misc4, misc5, misc6);
 }
 
 /* The count argument will always be computed with PAS_VA_NUM_ARGS in the client.

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to