Changeset 295570 in webkit

Timestamp:

Jun 15, 2022 1:20:53 PM (2 years ago)

Author:

Brandon

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

Location:

trunk/Source/bmalloc/libpas/src/libpas

Files:

• pas_utils.c (modified) (1 diff)
• pas_utils.h (modified) (7 diffs)

trunk/Source/bmalloc/libpas/src/libpas/pas_utils.c

@@ -172 +172 @@
     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 */
 

trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h

@@ -219 +219 @@
 
 #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(
@@ -277 +279 @@
 {
     PAS_REPORT_ASSERTION_FAILED(filename, line, function, expression);
-    pas_crash_with_info_impl1(line, misc1);
+    pas_crash_with_info_impl1((uint64_t)line, misc1);
 }
 
@@ -284 +286 @@
 {
     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);
 }
 
@@ -291 +293 @@
 {
     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);
 }
 
@@ -298 +300 @@
 {
     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);
 }
 
@@ -305 +307 @@
 {
     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);
 }
 
@@ -312 +314 @@
 {
     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);
 }