@@ -82,29 +82,39 @@ enum class align_val_t: size_t {};
8282//  OS X we need to intercept them using their mangled names.
8383#if  !SANITIZER_APPLE
8484CXX_OPERATOR_ATTRIBUTE
85- void  *operator  new (size_t  size)
86- { OPERATOR_NEW_BODY (FROM_NEW, false  /* nothrow*/  ); }
85+ void  *operator  new (size_t  size) {
86+   OPERATOR_NEW_BODY (FROM_NEW, false  /* nothrow*/  );
87+ }
8788CXX_OPERATOR_ATTRIBUTE
88- void  *operator  new [](size_t  size)
89- { OPERATOR_NEW_BODY (FROM_NEW_BR, false  /* nothrow*/  ); }
89+ void  *operator  new [](size_t  size) {
90+   OPERATOR_NEW_BODY (FROM_NEW_BR, false  /* nothrow*/  );
91+ }
9092CXX_OPERATOR_ATTRIBUTE
91- void  *operator  new (size_t  size, std::nothrow_t  const &)
92- { OPERATOR_NEW_BODY (FROM_NEW, true  /* nothrow*/  ); }
93+ void  *operator  new (size_t  size, std::nothrow_t  const  &) {
94+   OPERATOR_NEW_BODY (FROM_NEW, true  /* nothrow*/  );
95+ }
9396CXX_OPERATOR_ATTRIBUTE
94- void  *operator  new [](size_t  size, std::nothrow_t  const &)
95- { OPERATOR_NEW_BODY (FROM_NEW_BR, true  /* nothrow*/  ); }
97+ void  *operator  new [](size_t  size, std::nothrow_t  const  &) {
98+   OPERATOR_NEW_BODY (FROM_NEW_BR, true  /* nothrow*/  );
99+ }
96100CXX_OPERATOR_ATTRIBUTE
97- void  *operator  new (size_t  size, std::align_val_t  align)
98- { OPERATOR_NEW_BODY_ALIGN (FROM_NEW, false  /* nothrow*/  ); }
101+ void  *operator  new (size_t  size, std::align_val_t  align) {
102+   OPERATOR_NEW_BODY_ALIGN (FROM_NEW, false  /* nothrow*/  );
103+ }
99104CXX_OPERATOR_ATTRIBUTE
100- void  *operator  new [](size_t  size, std::align_val_t  align)
101- { OPERATOR_NEW_BODY_ALIGN (FROM_NEW_BR, false  /* nothrow*/  ); }
105+ void  *operator  new [](size_t  size, std::align_val_t  align) {
106+   OPERATOR_NEW_BODY_ALIGN (FROM_NEW_BR, false  /* nothrow*/  );
107+ }
102108CXX_OPERATOR_ATTRIBUTE
103- void  *operator  new (size_t  size, std::align_val_t  align, std::nothrow_t  const &)
104- { OPERATOR_NEW_BODY_ALIGN (FROM_NEW, true  /* nothrow*/  ); }
109+ void  *operator  new (size_t  size, std::align_val_t  align,
110+                    std::nothrow_t  const  &) {
111+   OPERATOR_NEW_BODY_ALIGN (FROM_NEW, true  /* nothrow*/  );
112+ }
105113CXX_OPERATOR_ATTRIBUTE
106- void  *operator  new [](size_t  size, std::align_val_t  align, std::nothrow_t  const &)
107- { OPERATOR_NEW_BODY_ALIGN (FROM_NEW_BR, true  /* nothrow*/  ); }
114+ void  *operator  new [](size_t  size, std::align_val_t  align,
115+                      std::nothrow_t  const  &) {
116+   OPERATOR_NEW_BODY_ALIGN (FROM_NEW_BR, true  /* nothrow*/  );
117+ }
108118
109119#else   //  SANITIZER_APPLE
110120INTERCEPTOR (void  *, _Znwm, size_t  size) {
@@ -139,49 +149,62 @@ INTERCEPTOR(void *, _ZnamRKSt9nothrow_t, size_t size, std::nothrow_t const&) {
139149
140150#if  !SANITIZER_APPLE
141151CXX_OPERATOR_ATTRIBUTE
142- void  operator  delete (void  *ptr) NOEXCEPT
143- { OPERATOR_DELETE_BODY (FROM_NEW); }
152+ void  operator  delete (void  *ptr) NOEXCEPT { OPERATOR_DELETE_BODY (FROM_NEW); }
144153CXX_OPERATOR_ATTRIBUTE
145- void  operator  delete[] (void  *ptr) NOEXCEPT
146- { OPERATOR_DELETE_BODY (FROM_NEW_BR); }
154+ void  operator  delete[] (void  *ptr) NOEXCEPT {
155+   OPERATOR_DELETE_BODY (FROM_NEW_BR);
156+ }
147157CXX_OPERATOR_ATTRIBUTE
148- void  operator  delete (void  *ptr, std::nothrow_t  const &)
149- { OPERATOR_DELETE_BODY (FROM_NEW); }
158+ void  operator  delete (void  *ptr, std::nothrow_t  const  &) {
159+   OPERATOR_DELETE_BODY (FROM_NEW);
160+ }
150161CXX_OPERATOR_ATTRIBUTE
151- void  operator  delete[] (void  *ptr, std::nothrow_t  const &)
152- { OPERATOR_DELETE_BODY (FROM_NEW_BR); }
162+ void  operator  delete[] (void  *ptr, std::nothrow_t  const  &) {
163+   OPERATOR_DELETE_BODY (FROM_NEW_BR);
164+ }
153165CXX_OPERATOR_ATTRIBUTE
154- void  operator  delete (void  *ptr, size_t  size) NOEXCEPT
155- { OPERATOR_DELETE_BODY_SIZE (FROM_NEW); }
166+ void  operator  delete (void  *ptr, size_t  size) NOEXCEPT {
167+   OPERATOR_DELETE_BODY_SIZE (FROM_NEW);
168+ }
156169CXX_OPERATOR_ATTRIBUTE
157- void  operator  delete[] (void  *ptr, size_t  size) NOEXCEPT
158- { OPERATOR_DELETE_BODY_SIZE (FROM_NEW_BR); }
170+ void  operator  delete[] (void  *ptr, size_t  size) NOEXCEPT {
171+   OPERATOR_DELETE_BODY_SIZE (FROM_NEW_BR);
172+ }
159173CXX_OPERATOR_ATTRIBUTE
160- void  operator  delete (void  *ptr, std::align_val_t  align) NOEXCEPT
161- { OPERATOR_DELETE_BODY_ALIGN (FROM_NEW); }
174+ void  operator  delete (void  *ptr, std::align_val_t  align) NOEXCEPT {
175+   OPERATOR_DELETE_BODY_ALIGN (FROM_NEW);
176+ }
162177CXX_OPERATOR_ATTRIBUTE
163- void  operator  delete[] (void  *ptr, std::align_val_t  align) NOEXCEPT
164- { OPERATOR_DELETE_BODY_ALIGN (FROM_NEW_BR); }
178+ void  operator  delete[] (void  *ptr, std::align_val_t  align) NOEXCEPT {
179+   OPERATOR_DELETE_BODY_ALIGN (FROM_NEW_BR);
180+ }
165181CXX_OPERATOR_ATTRIBUTE
166- void  operator  delete (void  *ptr, std::align_val_t  align, std::nothrow_t  const &)
167- { OPERATOR_DELETE_BODY_ALIGN (FROM_NEW); }
182+ void  operator  delete (void  *ptr, std::align_val_t  align,
183+                      std::nothrow_t  const  &) {
184+   OPERATOR_DELETE_BODY_ALIGN (FROM_NEW);
185+ }
168186CXX_OPERATOR_ATTRIBUTE
169- void  operator  delete[] (void  *ptr, std::align_val_t  align, std::nothrow_t  const &)
170- { OPERATOR_DELETE_BODY_ALIGN (FROM_NEW_BR); }
187+ void  operator  delete[] (void  *ptr, std::align_val_t  align,
188+                        std::nothrow_t  const  &) {
189+   OPERATOR_DELETE_BODY_ALIGN (FROM_NEW_BR);
190+ }
171191CXX_OPERATOR_ATTRIBUTE
172- void  operator  delete (void  *ptr, size_t  size, std::align_val_t  align) NOEXCEPT
173- { OPERATOR_DELETE_BODY_SIZE_ALIGN (FROM_NEW); }
192+ void  operator  delete (void  *ptr, size_t  size, std::align_val_t  align) NOEXCEPT {
193+   OPERATOR_DELETE_BODY_SIZE_ALIGN (FROM_NEW);
194+ }
174195CXX_OPERATOR_ATTRIBUTE
175- void  operator  delete[] (void  *ptr, size_t  size, std::align_val_t  align) NOEXCEPT
176- { OPERATOR_DELETE_BODY_SIZE_ALIGN (FROM_NEW_BR); }
196+ void  operator  delete[] (void  *ptr, size_t  size,
197+                        std::align_val_t  align) NOEXCEPT {
198+   OPERATOR_DELETE_BODY_SIZE_ALIGN (FROM_NEW_BR);
199+ }
177200
178201#else   //  SANITIZER_APPLE
179- INTERCEPTOR (void , _ZdlPv, void  *ptr)
180- { OPERATOR_DELETE_BODY (FROM_NEW ); }
181- INTERCEPTOR (void , _ZdaPv , void  *ptr) 
182- {  OPERATOR_DELETE_BODY (FROM_NEW_BR); } 
183- INTERCEPTOR ( void , _ZdlPvRKSt9nothrow_t,  void  *ptr, std:: nothrow_t   const &) 
184- {  OPERATOR_DELETE_BODY (FROM_NEW); } 
185- INTERCEPTOR ( void , _ZdaPvRKSt9nothrow_t,  void  *ptr, std:: nothrow_t   const &) 
186- {  OPERATOR_DELETE_BODY (FROM_NEW_BR);  }
202+ INTERCEPTOR (void , _ZdlPv, void  *ptr) {  OPERATOR_DELETE_BODY (FROM_NEW); } 
203+ INTERCEPTOR ( void , _ZdaPv,  void  *ptr)  { OPERATOR_DELETE_BODY (FROM_NEW_BR ); }
204+ INTERCEPTOR (void , _ZdlPvRKSt9nothrow_t , void  *ptr, std:: nothrow_t   const  &) { 
205+    OPERATOR_DELETE_BODY (FROM_NEW); 
206+ } 
207+ INTERCEPTOR ( void , _ZdaPvRKSt9nothrow_t,  void  *ptr, std:: nothrow_t   const  &) { 
208+    OPERATOR_DELETE_BODY (FROM_NEW_BR); 
209+ }
187210#endif   //  !SANITIZER_APPLE
0 commit comments