diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-02-07 17:35:26 -0800 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-02-07 17:35:26 -0800 |
| commit | 1aefd69e9875d18829981663e6bf3ceca9c72ede (patch) | |
| tree | 971465ca917eaf8817ce638525f69736fcde13d6 | |
| parent | 114eb57cabec658011e09a8ed3638275bfb46902 (diff) | |
| parent | 4d41e8f6f64fcf8056ed7a7e18fa8a49f2f29314 (diff) | |
| download | coreclr-1aefd69e9875d18829981663e6bf3ceca9c72ede.tar.gz coreclr-1aefd69e9875d18829981663e6bf3ceca9c72ede.tar.bz2 coreclr-1aefd69e9875d18829981663e6bf3ceca9c72ede.zip | |
Merge pull request #142 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/inc/corhlprpriv.h | 5 | ||||
| -rw-r--r-- | src/jit/instr.cpp | 1 | ||||
| -rw-r--r-- | src/vm/exceptionhandling.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/inc/corhlprpriv.h b/src/inc/corhlprpriv.h index bacdfb2f13..901507125b 100644 --- a/src/inc/corhlprpriv.h +++ b/src/inc/corhlprpriv.h @@ -184,6 +184,11 @@ public: _Alloc<TRUE /*bGrow*/, TRUE /*bThrow*/>(iItems); } +#ifdef __llvm__ + // This makes sure that we will not get an undefined symbol + // when building a release version of libcoreclr using LLVM. + __attribute__((used)) +#endif // __llvm__ HRESULT ReSizeNoThrow(SIZE_T iItems); void Shrink(SIZE_T iItems) diff --git a/src/jit/instr.cpp b/src/jit/instr.cpp index c618fedecc..84f7d20da3 100644 --- a/src/jit/instr.cpp +++ b/src/jit/instr.cpp @@ -455,7 +455,6 @@ void CodeGenInterface::inst_FN(instruction ins, unsigned stk) * Display a stack frame reference. */ -inline void CodeGen::inst_set_SV_var(GenTreePtr tree) { #ifdef DEBUG diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index 36dca5ee12..c46da950a6 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -4515,7 +4515,7 @@ void FixupDispatcherContext(DISPATCHER_CONTEXT* pDispatcherContext, CONTEXT* pCo // See the comment above for the overloaded version of this function. -FORCEINLINE void FixupDispatcherContext(DISPATCHER_CONTEXT* pDispatcherContext, CONTEXT* pContext, CONTEXT* pOriginalContext, PEXCEPTION_ROUTINE pUnwindPersonalityRoutine = NULL) +void FixupDispatcherContext(DISPATCHER_CONTEXT* pDispatcherContext, CONTEXT* pContext, CONTEXT* pOriginalContext, PEXCEPTION_ROUTINE pUnwindPersonalityRoutine = NULL) { _ASSERTE(pOriginalContext != NULL); FixupDispatcherContext(pDispatcherContext, pContext, (LPVOID)::GetIP(pOriginalContext), pUnwindPersonalityRoutine); |