This is an archive of the discontinued LLVM Phabricator instance.

[profile] gcov_mutex must be static
ClosedPublic

Authored by calixte on Feb 24 2020, 2:32 PM.

Reviewers

erik.pilkington
vsk

Commits

rG62c7d8402651: [profile] gcov_mutex must be static

Summary

Forget static keyword for gcov_mutex in https://reviews.llvm.org/D74953 and that causes test failure on mac.

Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptFeb 24 2020, 2:32 PM

I'm not really sure what the mutex is for, but it shouldn't be exported. This change looks fine.

This revision is now accepted and ready to land.Feb 24 2020, 4:07 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

lib/

profile/

4 lines

	Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines

	#include "InstrProfiling.h"			#include "InstrProfiling.h"
	#include "InstrProfilingUtil.h"			#include "InstrProfilingUtil.h"

	/* #define DEBUG_GCDAPROFILING */			/* #define DEBUG_GCDAPROFILING */

	#ifndef _WIN32			#ifndef _WIN32
	#include <pthread.h>			#include <pthread.h>
	pthread_mutex_t gcov_mutex = PTHREAD_MUTEX_INITIALIZER;			static pthread_mutex_t gcov_mutex = PTHREAD_MUTEX_INITIALIZER;
	static __inline void gcov_lock() { pthread_mutex_lock(&gcov_mutex); }			static __inline void gcov_lock() { pthread_mutex_lock(&gcov_mutex); }
	static __inline void gcov_unlock() { pthread_mutex_unlock(&gcov_mutex); }			static __inline void gcov_unlock() { pthread_mutex_unlock(&gcov_mutex); }
	#else			#else
	#include <windows.h>			#include <windows.h>
	SRWLOCK gcov_mutex = SRWLOCK_INIT;			static SRWLOCK gcov_mutex = SRWLOCK_INIT;
	static __inline void gcov_lock() { AcquireSRWLockExclusive(&gcov_mutex); }			static __inline void gcov_lock() { AcquireSRWLockExclusive(&gcov_mutex); }
	static __inline void gcov_unlock() { ReleaseSRWLockExclusive(&gcov_mutex); }			static __inline void gcov_unlock() { ReleaseSRWLockExclusive(&gcov_mutex); }
	#endif			#endif

	/*			/*
	* --- GCOV file format I/O primitives ---			* --- GCOV file format I/O primitives ---
	*/			*/

	▲ Show 20 Lines • Show All 652 Lines • Show Last 20 Lines