diff options
-rw-r--r-- | src/pal/src/config.h.in | 2 | ||||
-rw-r--r-- | src/pal/src/exception/signal.cpp | 1 | ||||
-rw-r--r-- | src/vm/memberload.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/pal/src/config.h.in b/src/pal/src/config.h.in index 6869455d09..115e1886a8 100644 --- a/src/pal/src/config.h.in +++ b/src/pal/src/config.h.in @@ -166,7 +166,7 @@ #define OPEN64_IS_USED_INSTEAD_OF_OPEN 0 #define PAL_IGNORE_NORMAL_THREAD_PRIORITY 0 #define SELF_SUSPEND_FAILS_WITH_NATIVE_SUSPENSION 0 -#define SET_SCHEDPARAM_NEEDS_PRIVS 0 +#define SET_SCHEDPARAM_NEEDS_PRIVS 1 #define SIGWAIT_FAILS_WHEN_PASSED_FULL_SIGSET 0 #define WRITE_0_BYTES_HANGS_TTY 0 #define HAVE_FTRUNCATE_LARGE_LENGTH_SUPPORT 1 diff --git a/src/pal/src/exception/signal.cpp b/src/pal/src/exception/signal.cpp index 325a1501c7..fa3a47f910 100644 --- a/src/pal/src/exception/signal.cpp +++ b/src/pal/src/exception/signal.cpp @@ -691,6 +691,7 @@ PAL_ERROR InjectActivationInternal(CorUnix::CPalThread* pThread) int status = pthread_kill(pThread->GetPThreadSelf(), INJECT_ACTIVATION_SIGNAL); if ((status != 0) && (status != EAGAIN)) { + printf("thread_t : 0x%08lx(%lu), status : %s\n", pThread->GetPThreadSelf(), pThread->GetPThreadSelf(), strerror(status)); // Failure to send the signal is fatal. There are only two cases when sending // the signal can fail. First, if the signal ID is invalid and second, // if the thread doesn't exist anymore. diff --git a/src/vm/memberload.cpp b/src/vm/memberload.cpp index 4bd663a47b..7ea16108e4 100644 --- a/src/vm/memberload.cpp +++ b/src/vm/memberload.cpp @@ -1103,6 +1103,7 @@ MemberLoader::FindMethod( for (; it.IsValid(); it.Prev()) { MethodDesc *pCurDeclMD = it.GetDeclMethodDesc(); + LPCUTF8 pCurDeclMDName = NULL; #ifdef _DEBUG MethodTable *pCurDeclMT = pCurDeclMD->GetMethodTable(); CONSISTENCY_CHECK(!pMT->IsInterface() || pCurDeclMT == pMT->GetCanonicalMethodTable()); @@ -1117,7 +1118,8 @@ MemberLoader::FindMethod( || (pCurDeclMD->MightHaveName(targetNameHash) // This is done last since it is the most expensive of the IF statement. - && StrCompFunc(pszName, pCurDeclMD->GetName()) == 0) + && (pCurDeclMDName = pCurDeclMD->GetName()) != NULL + && StrCompFunc(pszName, pCurDeclMDName) == 0) ) { if (CompareMethodSigWithCorrectSubstitution(pSignature, cSignature, pModule, pCurDeclMD, pDefSubst, pMT)) |