Changeset 90477 in webkit

Timestamp:

Jul 6, 2011 11:58:47 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-07-06 Dmitriy Vyukov <​dvyukov@google.com>

Reviewed by David Levin.

Allow substitution of dynamic annotations and prevent identical code folding by the linker.
​https://bugs.webkit.org/show_bug.cgi?id=62443

• wtf/DynamicAnnotations.cpp: (WTFAnnotateBenignRaceSized): (WTFAnnotateHappensBefore): (WTFAnnotateHappensAfter):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/DynamicAnnotations.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-06  Dmitriy Vyukov  <dvyukov@google.com>
+
+        Reviewed by David Levin.
+
+        Allow substitution of dynamic annotations and prevent identical code folding by the linker.
+        https://bugs.webkit.org/show_bug.cgi?id=62443
+
+        * wtf/DynamicAnnotations.cpp:
+        (WTFAnnotateBenignRaceSized):
+        (WTFAnnotateHappensBefore):
+        (WTFAnnotateHappensAfter):
+
 2011-07-06  Zoltan Herczeg  <zherczeg@inf.u-szeged.hu>
 

trunk/Source/JavaScriptCore/wtf/DynamicAnnotations.cpp

@@ -29 +29 @@
 #include "DynamicAnnotations.h"
 
-#if USE(DYNAMIC_ANNOTATIONS)
-void WTFAnnotateBenignRaceSized(const char*, int, const volatile void*, long, const char*) { }
-void WTFAnnotateHappensBefore(const char*, int, const volatile void*) { }
-void WTFAnnotateHappensAfter(const char*, int, const volatile void*) { }
-#endif // USE(DYNAMIC_ANNOTATIONS)
+#if USE(DYNAMIC_ANNOTATIONS) && !USE(DYNAMIC_ANNOTATIONS_NOIMPL)
+
+// Identical code folding(-Wl,--icf=all) countermeasures.
+// This makes all Annotate* functions different, which prevents the linker from
+// folding them.
+#ifdef __COUNTER__
+#define DYNAMIC_ANNOTATIONS_IMPL \
+    volatile short lineno = (__LINE__ << 8) + __COUNTER__; \
+    (void)lineno;
+#else
+#define DYNAMIC_ANNOTATIONS_IMPL \
+    volatile short lineno = (__LINE__ << 8); \
+    (void)lineno;
+#endif
+
+void WTFAnnotateBenignRaceSized(const char*, int, const volatile void*, long, const char*)
+{
+    DYNAMIC_ANNOTATIONS_IMPL
+}
+
+void WTFAnnotateHappensBefore(const char*, int, const volatile void*)
+{
+    DYNAMIC_ANNOTATIONS_IMPL
+}
+
+void WTFAnnotateHappensAfter(const char*, int, const volatile void*)
+{
+    DYNAMIC_ANNOTATIONS_IMPL
+}
+
+#endif // USE(DYNAMIC_ANNOTATIONS) && !USE(DYNAMIC_ANNOTATIONS_NOIMPL)