diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2016-04-01 11:46:15 -0700 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2016-04-06 09:35:41 -0700 |
| commit | dd8e3c255fb32061dacf005150d4c8e985283acc (patch) | |
| tree | 5d0b177ff521995cfc7ffe78afbf878d85ec14fc /src/vm/interpreter.cpp | |
| parent | 66f98c36fb79ecf8982547594eda392dadd17c82 (diff) | |
| download | coreclr-dd8e3c255fb32061dacf005150d4c8e985283acc.tar.gz coreclr-dd8e3c255fb32061dacf005150d4c8e985283acc.tar.bz2 coreclr-dd8e3c255fb32061dacf005150d4c8e985283acc.zip | |
Replace SimplerHash with SHash in the interpreter.
This removes the only usage of SimplerHashTable outside of the JIT
and the GC info encoder.
Diffstat (limited to 'src/vm/interpreter.cpp')
| -rw-r--r-- | src/vm/interpreter.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/vm/interpreter.cpp b/src/vm/interpreter.cpp index bdfa9622f9..db996574ad 100644 --- a/src/vm/interpreter.cpp +++ b/src/vm/interpreter.cpp @@ -23,7 +23,6 @@ #include "runtimehandles.h" #include "vars.hpp" #include "cycletimer.h" -#include "defaultallocator.h" #ifdef FEATURE_REMOTING #include "remoting.h" #endif @@ -10838,7 +10837,7 @@ Interpreter::AddrToMDMap* Interpreter::GetAddrToMdMap() if (s_addrToMDMap == NULL) { - s_addrToMDMap = new AddrToMDMap(DefaultAllocator::Singleton()); + s_addrToMDMap = new AddrToMDMap(); } return s_addrToMDMap; } @@ -10860,7 +10859,7 @@ void Interpreter::RecordInterpreterStubForMethodDesc(CORINFO_METHOD_HANDLE md, v CORINFO_METHOD_HANDLE dummy; assert(!map->Lookup(addr, &dummy)); #endif // DEBUG - map->Set(addr, md); + map->AddOrReplace(KeyValuePair<void*,CORINFO_METHOD_HANDLE>(addr, md)); } MethodDesc* Interpreter::InterpretationStubToMethodInfo(PCODE addr) @@ -10900,7 +10899,7 @@ Interpreter::MethodHandleToInterpMethInfoPtrMap* Interpreter::GetMethodHandleToI if (s_methodHandleToInterpMethInfoPtrMap == NULL) { - s_methodHandleToInterpMethInfoPtrMap = new MethodHandleToInterpMethInfoPtrMap(DefaultAllocator::Singleton()); + s_methodHandleToInterpMethInfoPtrMap = new MethodHandleToInterpMethInfoPtrMap(); } return s_methodHandleToInterpMethInfoPtrMap; } @@ -10936,8 +10935,8 @@ InterpreterMethodInfo* Interpreter::RecordInterpreterMethodInfoForMethodHandle(C mi.m_thread = GetThread(); #endif - bool b = map->Set(md, mi); - _ASSERTE_MSG(!b, "Multiple InterpMethInfos for method desc."); + _ASSERTE_MSG(map->LookupPtr(md) == NULL, "Multiple InterpMethInfos for method desc."); + map->Add(md, mi); return methInfo; } |