From: Sergey Andreenko <seandree@microsoft.com>
Date: Fri, 22 Dec 2017 21:15:41 +0000 (-0800)
Subject: Small changes around stack levels. (#15616)
X-Git-Tag: accepted/tizen/base/20180629.140029~268
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7d457f11cf553e46aab1da225be83e73fc783e8;p=platform%2Fupstream%2Fcoreclr.git

Small changes around stack levels. (#15616)

* add ifdef for fgThrowHlpBlkStkLevel

* fgFindExcptnTarget should not be called fof dbg code compilation mode.
---

diff --git a/src/jit/compiler.h b/src/jit/compiler.h
index 904d993..71cfba0 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 83a7ff3..ebd1894 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 b6ae5c0..7dbf463 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))
     {