Backed out changeset d85334f696eb (bug 1285057) for implicitly depend…

…ing on clang 3.8.
iaxat · Sep 23, 2016 · 660a195 · 660a195
1 parent fceed03
commit 660a195
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
@@ -646,9 +646,7 @@ class alignas(8) DispatchWrapper
 
     // Trace the contained storage (of unknown type) using the trace function
     // we set aside when we did know the type.
-    MOZ_UBSAN_BLACKLIST_FUNCTION static void TraceWrapped(JSTracer* trc, T* thingp,
-                                                          const char* name)
-    {
+    static void TraceWrapped(JSTracer* trc, T* thingp, const char* name) {
         auto wrapper = reinterpret_cast<DispatchWrapper*>(
                            uintptr_t(thingp) - offsetof(DispatchWrapper, storage));
         wrapper->tracer(trc, &wrapper->storage, name);

diff --git a/js/public/SweepingAPI.h b/js/public/SweepingAPI.h
@@ -57,7 +57,7 @@ class WeakCache : public js::WeakCacheBase<T>,
     const T& get() const { return cache; }
     T& get() { return cache; }
 
-    MOZ_UBSAN_BLACKLIST_FUNCTION void sweep() { sweeper(&cache); }
+    void sweep() { sweeper(&cache); }
 };
 
 } // namespace JS

diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h
@@ -208,19 +208,6 @@
 #  define MOZ_TSAN_BLACKLIST /* nothing */
 #endif
 
-/*
- * MOZ_UBSAN_BLACKLIST_FUNCTION is a macro to tell UndefinedBehaviorSanitizer (a
- * run-time instrumentation shipped with Clang) to not check the annotated
- * function for undefined behaviors. Furthermore it prevents the compiler from
- * inlining the function because inlining currently breaks the blacklisting
- * mechanism of UBSan.
- */
-#if defined(__clang__)
-# define MOZ_UBSAN_BLACKLIST_FUNCTION MOZ_NEVER_INLINE __attribute__((no_sanitize("function")))
-#else
-# define MOZ_UBSAN_BLACKLIST_FUNCTION /* nothing */
-#endif
-
 /**
  * MOZ_ALLOCATOR tells the compiler that the function it marks returns either a
  * "fresh", "pointer-free" block of memory, or nullptr. "Fresh" means that the