fix tfs build crash
authorSergey Andreenko <seandree@microsoft.com>
Mon, 24 Oct 2016 21:33:13 +0000 (14:33 -0700)
committerSergey Andreenko <seandree@microsoft.com>
Mon, 24 Oct 2016 23:36:09 +0000 (16:36 -0700)
ifdef EE version statements were forgotten in two files.
Braket was on the wrong line.

src/jit/importer.cpp
src/jit/utils.cpp
src/jit/valuenum.cpp

index 7f5e447..de564f0 100644 (file)
@@ -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))
index 066fd7e..6b62cb7 100644 (file)
@@ -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
index 3a8b6de..0298bb5 100644 (file)
@@ -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;