From: Jonghyun Park <parjong@gmail.com>
Date: Mon, 10 Apr 2017 22:50:56 +0000 (+0900)
Subject: Extract genInterruptible setting as a separate region
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7318^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33e79e49e6b2dc01027c8ff9fc6ed9c51b5124c0;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Extract genInterruptible setting as a separate region


Commit migrated from https://github.com/dotnet/coreclr/commit/fda1a8dad16136f659530a657f56546eda68466f
---

diff --git a/src/coreclr/src/jit/morph.cpp b/src/coreclr/src/jit/morph.cpp
index 40e9b35..92d5e09 100644
--- a/src/coreclr/src/jit/morph.cpp
+++ b/src/coreclr/src/jit/morph.cpp
@@ -16204,11 +16204,6 @@ void Compiler::fgSetOptions()
     if (info.compXcptnsCount > 0)
     {
         codeGen->setFramePointerRequiredEH(true);
-#ifdef UNIX_X86_ABI
-        assert(!codeGen->isGCTypeFixed());
-        // Enforce fully interruptible codegen for funclet unwinding
-        genInterruptible = true;
-#endif // UNIX_X86_ABI
     }
 
 #else // !_TARGET_X86_
@@ -16220,6 +16215,15 @@ void Compiler::fgSetOptions()
 
 #endif // _TARGET_X86_
 
+#ifdef UNIX_X86_ABI
+    if (info.compXcptnsCount > 0)
+    {
+        assert(!codeGen->isGCTypeFixed());
+        // Enforce fully interruptible codegen for funclet unwinding
+        genInterruptible = true;
+    }
+#endif // UNIX_X86_ABI
+
     fgCheckArgCnt();
 
     if (info.compCallUnmanaged)