From: Sergey Andreenko <seandree@microsoft.com>
Date: Mon, 24 Oct 2016 21:33:13 +0000 (-0700)
Subject: fix tfs build crash
X-Git-Tag: accepted/tizen/base/20180629.140029~3244^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c6fb3aa1f117d0c101bafa1f9af54062f193d6e;p=platform%2Fupstream%2Fcoreclr.git

fix tfs build crash

ifdef EE version statements were forgotten in two files.
Braket was on the wrong line.
---

diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp
index 7f5e447..de564f0 100644
--- a/src/jit/importer.cpp
+++ b/src/jit/importer.cpp
@@ -5802,12 +5802,12 @@ GenTreePtr Compiler::impImportStaticFieldAccess(CORINFO_RESOLVED_TOKEN* pResolve
             FieldSeqNode* fs = GetFieldSeqStore()->CreateSingleton(pResolvedToken->hField);
             op1              = gtNewOperNode(GT_ADD, type, op1,
                                 new (this, GT_CNS_INT) GenTreeIntCon(TYP_I_IMPL, pFieldInfo->offset, fs));
-            break;
 #else
             unreached();
 #endif // FEATURE_READYTORUN_COMPILER
-#endif // COR_JIT_EE_VERSION > 460
         }
+        break;
+#endif // COR_JIT_EE_VERSION > 460
         default:
         {
             if (!(access & CORINFO_ACCESS_ADDRESS))
diff --git a/src/jit/utils.cpp b/src/jit/utils.cpp
index 066fd7e..6b62cb7 100644
--- a/src/jit/utils.cpp
+++ b/src/jit/utils.cpp
@@ -1411,7 +1411,9 @@ void HelperCallProperties::init()
             case CORINFO_HELP_GETGENERICS_GCSTATIC_BASE:
             case CORINFO_HELP_GETGENERICS_NONGCSTATIC_BASE:
             case CORINFO_HELP_READYTORUN_STATIC_BASE:
+#if COR_JIT_EE_VERSION > 460
             case CORINFO_HELP_READYTORUN_GENERIC_STATIC_BASE:
+#endif // COR_JIT_EE_VERSION > 460
 
                 // These may invoke static class constructors
                 // These can throw InvalidProgram exception if the class can not be constructed
diff --git a/src/jit/valuenum.cpp b/src/jit/valuenum.cpp
index 3a8b6de..0298bb5 100644
--- a/src/jit/valuenum.cpp
+++ b/src/jit/valuenum.cpp
@@ -7167,9 +7167,11 @@ VNFunc Compiler::fgValueNumberHelperMethVNFunc(CorInfoHelpFunc helpFunc)
         case CORINFO_HELP_READYTORUN_STATIC_BASE:
             vnf = VNF_ReadyToRunStaticBase;
             break;
+#if COR_JIT_EE_VERSION > 460
         case CORINFO_HELP_READYTORUN_GENERIC_STATIC_BASE:
             vnf = VNF_ReadyToRunGenericStaticBase;
             break;
+#endif // COR_JIT_EE_VERSION > 460
         case CORINFO_HELP_GETSHARED_GCSTATIC_BASE_DYNAMICCLASS:
             vnf = VNF_GetsharedGcstaticBaseDynamicclass;
             break;