Extract genInterruptible setting as a separate region
authorJonghyun Park <parjong@gmail.com>
Mon, 10 Apr 2017 22:50:56 +0000 (07:50 +0900)
committerJonghyun Park <parjong@gmail.com>
Mon, 10 Apr 2017 22:50:56 +0000 (07:50 +0900)
Commit migrated from https://github.com/dotnet/coreclr/commit/fda1a8dad16136f659530a657f56546eda68466f

src/coreclr/src/jit/morph.cpp

index 40e9b35..92d5e09 100644 (file)
@@ -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)