diff options
author | Sinan Kaya <41809318+franksinankaya@users.noreply.github.com> | 2019-02-20 11:59:22 -0500 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-20 08:59:22 -0800 |
commit | 1a1bb292ab53c0c30d35dc396c7089c1da5b3c82 (patch) | |
tree | bd590b373c55ad23997b9cdd3979951479d5beaf /src/vm | |
parent | 3c2e989c61c7466bc6d061e03277dbbd8a7e54e9 (diff) | |
download | coreclr-1a1bb292ab53c0c30d35dc396c7089c1da5b3c82.tar.gz coreclr-1a1bb292ab53c0c30d35dc396c7089c1da5b3c82.tar.bz2 coreclr-1a1bb292ab53c0c30d35dc396c7089c1da5b3c82.zip |
Abstract deprecated and selectany for GCC and remove LLVM'ism where possible (#22662)
* Abstract selectany
* Fix initializer element is not constant
src/corefx/System.Globalization.Native/pal_icushim.c:58:34: error: initializer element is not constant
static const int MaxICUVersion = MinICUVersion + 20;
* Enable ms extensions
* Apply LLVM patterns to GCC
* Remove deprecated function
* Fix const conversion error
src/corefx/System.Globalization.Native/pal_calendarData.c:390:16: warning: passing argument 1 of ‘ures_close_ptr’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
ures_close(erasResBundle);
src/corefx/System.Globalization.Native/pal_calendarData.c:419:22: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
char* name = GetCalendarName(calendarId);
* Remove old compiler option
Diffstat (limited to 'src/vm')
-rw-r--r-- | src/vm/appdomain.cpp | 26 | ||||
-rw-r--r-- | src/vm/appdomain.hpp | 3 |
2 files changed, 1 insertions, 28 deletions
diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 42e26c99d1..6d68dff1a3 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -3120,32 +3120,6 @@ Assembly* SystemDomain::GetCallersAssembly(StackCrawlMark *stackMark, return NULL; } -/*static*/ -Module* SystemDomain::GetCallersModule(int skip) -{ - CONTRACTL - { - THROWS; - GC_TRIGGERS; - MODE_ANY; - INJECT_FAULT(COMPlusThrowOM();); - } - CONTRACTL_END; - - GCX_COOP(); - - CallersData cdata; - ZeroMemory(&cdata, sizeof(CallersData)); - cdata.skip = skip; - - StackWalkFunctions(GetThread(), CallersMethodCallback, &cdata); - - if(cdata.pMethod) - return cdata.pMethod->GetModule(); - else - return NULL; -} - /*private static*/ StackWalkAction SystemDomain::CallersMethodCallbackWithStackMark(CrawlFrame* pCf, VOID* data) { diff --git a/src/vm/appdomain.hpp b/src/vm/appdomain.hpp index b10ed26df2..6c88127c5b 100644 --- a/src/vm/appdomain.hpp +++ b/src/vm/appdomain.hpp @@ -3441,8 +3441,7 @@ public: //**************************************************************************************** // Methods used to get the callers module and hence assembly and app domain. - __declspec(deprecated("This method is deprecated, use the version that takes a StackCrawlMark instead")) - static Module* GetCallersModule(int skip); + static MethodDesc* GetCallersMethod(StackCrawlMark* stackMark, AppDomain **ppAppDomain = NULL); static MethodTable* GetCallersType(StackCrawlMark* stackMark, AppDomain **ppAppDomain = NULL); static Module* GetCallersModule(StackCrawlMark* stackMark, AppDomain **ppAppDomain = NULL); |