diff options
| author | Sergey Andreenko <seandree@microsoft.com> | 2017-12-22 13:15:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-22 13:15:41 -0800 |
| commit | d7d457f11cf553e46aab1da225be83e73fc783e8 (patch) | |
| tree | 4ee77753992719344a474a99be058ee528c26b74 | |
| parent | 9442717a9455847912a18fd174909a5c8c253334 (diff) | |
| download | coreclr-d7d457f11cf553e46aab1da225be83e73fc783e8.tar.gz coreclr-d7d457f11cf553e46aab1da225be83e73fc783e8.tar.bz2 coreclr-d7d457f11cf553e46aab1da225be83e73fc783e8.zip | |
Small changes around stack levels. (#15616)
* add ifdef for fgThrowHlpBlkStkLevel
* fgFindExcptnTarget should not be called fof dbg code compilation mode.
| -rw-r--r-- | src/jit/compiler.h | 3 | ||||
| -rw-r--r-- | src/jit/compiler.hpp | 4 | ||||
| -rw-r--r-- | src/jit/flowgraph.cpp | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/jit/compiler.h b/src/jit/compiler.h index 904d993f32..71cfba038d 100644 --- a/src/jit/compiler.h +++ b/src/jit/compiler.h @@ -4956,7 +4956,10 @@ private: bool fgIsCodeAdded(); bool fgIsThrowHlpBlk(BasicBlock* block); + +#if !FEATURE_FIXED_OUT_ARGS unsigned fgThrowHlpBlkStkLevel(BasicBlock* block); +#endif // !FEATURE_FIXED_OUT_ARGS unsigned fgBigOffsetMorphingTemps[TYP_COUNT]; diff --git a/src/jit/compiler.hpp b/src/jit/compiler.hpp index 83a7ff36d7..ebd1894cca 100644 --- a/src/jit/compiler.hpp +++ b/src/jit/compiler.hpp @@ -3031,6 +3031,8 @@ inline bool Compiler::fgIsThrowHlpBlk(BasicBlock* block) return false; } +#if !FEATURE_FIXED_OUT_ARGS + /***************************************************************************** * * Return the stackLevel of the inserted block that throws exception @@ -3064,6 +3066,8 @@ inline unsigned Compiler::fgThrowHlpBlkStkLevel(BasicBlock* block) return 0; } +#endif // !FEATURE_FIXED_OUT_ARGS + /* Small inline function to change a given block to a throw block. diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp index b6ae5c0dbb..7dbf463f48 100644 --- a/src/jit/flowgraph.cpp +++ b/src/jit/flowgraph.cpp @@ -18393,6 +18393,7 @@ BasicBlock* Compiler::fgAddCodeRef(BasicBlock* srcBlk, unsigned refData, Special Compiler::AddCodeDsc* Compiler::fgFindExcptnTarget(SpecialCodeKind kind, unsigned refData) { + assert(!opts.compDbgCode); if (!(fgExcptnTargetCache[kind] && // Try the cached value first fgExcptnTargetCache[kind]->acdData == refData)) { |