Changeset 196871 in webkit

Timestamp:

Feb 20, 2016, 10:14:38 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Use of inlined asm statements causes problems for -std=c99 builds.
​https://bugs.webkit.org/show_bug.cgi?id=154507

Reviewed by Dan Bernstein.

Source/bmalloc:

• bmalloc/BAssert.h:

Source/WTF:

WTF's Assertions.h may inadvertantly get included by other projects that are built
with -std=c99. The use of the inlined asm statements with the keyword "asm" is
not recognized when the -std compiler flag is used.

​https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html says "When writing code that
can be compiled with -ansi and the various -std options, use asm instead of
asm (see Alternate Keywords)."

So, to be a good citizen, we can change the use of "asm" in CRASH() to "asm"
so that we don't break the build of such other projects.

• wtf/Assertions.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Assertions.h (modified) (1 diff)
• bmalloc/ChangeLog (modified) (1 diff)
• bmalloc/bmalloc/BAssert.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-02-20  Mark Lam  <mark.lam@apple.com>
+
+        Use of inlined asm statements causes problems for -std=c99 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=154507
+
+        Reviewed by Dan Bernstein.
+
+        WTF's Assertions.h may inadvertantly get included by other projects that are built
+        with -std=c99.  The use of the inlined asm statements with the keyword "asm" is
+        not recognized when the -std compiler flag is used.
+
+        https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html says "When writing code that
+        can be compiled with -ansi and the various -std options, use __asm__ instead of
+        asm (see Alternate Keywords)."
+
+        So, to be a good citizen, we can change the use of "asm" in CRASH() to "__asm__"
+        so that we don't break the build of such other projects.
+
+        * wtf/Assertions.h:
+
 2016-02-18  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WTF/wtf/Assertions.h

@@ -156 +156 @@
 #if defined(NDEBUG) && OS(DARWIN)
 #if CPU(X86_64) || CPU(X86)
-#define WTFBreakpointTrap()  asm volatile ("int3")
+#define WTFBreakpointTrap()  __asm__ volatile ("int3")
 #elif CPU(ARM_THUMB2)
-#define WTFBreakpointTrap()  asm volatile ("bkpt #0")
+#define WTFBreakpointTrap()  __asm__ volatile ("bkpt #0")
 #elif CPU(ARM64)
-#define WTFBreakpointTrap()  asm volatile ("brk #0")
+#define WTFBreakpointTrap()  __asm__ volatile ("brk #0")
 #else
 #error "Unsupported CPU".

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2016-02-20  Mark Lam  <mark.lam@apple.com>
+
+        Use of inlined asm statements causes problems for -std=c99 builds.
+        https://bugs.webkit.org/show_bug.cgi?id=154507
+
+        Reviewed by Dan Bernstein.
+
+        * bmalloc/BAssert.h:
+
 2016-02-19  Joonghun Park  <jh718.park@samsung.com>
 

trunk/Source/bmalloc/bmalloc/BAssert.h

@@ -32 +32 @@
 
 #if BCPU(X86_64) || BCPU(X86)
-#define BBreakpointTrap()  asm volatile ("int3")
+#define BBreakpointTrap()  __asm__ volatile ("int3")
 #elif BCPU(ARM_THUMB2)
-#define BBreakpointTrap()  asm volatile ("bkpt #0")
+#define BBreakpointTrap()  __asm__ volatile ("bkpt #0")
 #elif BCPU(ARM64)
-#define BBreakpointTrap()  asm volatile ("brk #0")
+#define BBreakpointTrap()  __asm__ volatile ("brk #0")
 #else
 #error "Unsupported CPU".