@@ -2230,7 +2230,6 @@ static int OnExit(ThreadState *thr) {
2230
2230
2231
2231
struct TsanInterceptorContext {
2232
2232
ThreadState *thr;
2233
- const uptr caller_pc;
2234
2233
const uptr pc;
2235
2234
};
2236
2235
@@ -2271,17 +2270,17 @@ static void HandleRecvmsg(ThreadState *thr, uptr pc,
2271
2270
((TsanInterceptorContext *) ctx)->pc, (uptr) ptr, size, \
2272
2271
false)
2273
2272
2274
- #define COMMON_INTERCEPTOR_ENTER (ctx, func, ...) \
2275
- SCOPED_TSAN_INTERCEPTOR (func, __VA_ARGS__); \
2276
- TsanInterceptorContext _ctx = {thr, caller_pc, pc}; \
2277
- ctx = (void *)&_ctx; \
2278
- (void ) ctx;
2273
+ #define COMMON_INTERCEPTOR_ENTER (ctx, func, ...) \
2274
+ SCOPED_TSAN_INTERCEPTOR (func, __VA_ARGS__); \
2275
+ TsanInterceptorContext _ctx = {thr, pc}; \
2276
+ ctx = (void *)&_ctx; \
2277
+ (void )ctx;
2279
2278
2280
2279
#define COMMON_INTERCEPTOR_ENTER_NOIGNORE (ctx, func, ...) \
2281
2280
SCOPED_INTERCEPTOR_RAW (func, __VA_ARGS__); \
2282
- TsanInterceptorContext _ctx = {thr, caller_pc, pc}; \
2281
+ TsanInterceptorContext _ctx = {thr, pc}; \
2283
2282
ctx = (void *)&_ctx; \
2284
- (void ) ctx;
2283
+ (void )ctx;
2285
2284
2286
2285
#define COMMON_INTERCEPTOR_FILE_OPEN (ctx, file, path ) \
2287
2286
if (path) \
0 commit comments