From: Dan Moseley <danmose@microsoft.com>
Date: Mon, 11 Jun 2018 21:42:35 +0000 (-0700)
Subject: Reword invalid program exception message (#18409)
X-Git-Tag: accepted/tizen/unified/20190422.045933~1926
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b7d6a0e4f357e86e2092101acbe7b6458ee40af;p=platform%2Fupstream%2Fcoreclr.git

Reword invalid program exception message (#18409)

* Reword invalid program exception message

* Reword

* Update msg
---

diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc
index 42c0be4..21a24c9 100644
--- a/src/dlls/mscorrc/mscorrc.rc
+++ b/src/dlls/mscorrc/mscorrc.rc
@@ -1417,7 +1417,7 @@ BEGIN
 
     IDS_EE_ARRAY_DIMENSIONS_EXCEEDED        "Array dimensions exceeded supported range."
 
-    IDS_EE_CANNOT_LOAD_JIT                  "Unable to load Jit Compiler: (%s): file may be missing or corrupt. Please check or rerun setup."
+    IDS_EE_CANNOT_LOAD_JIT                  "Unable to load JIT Compiler: (%s): file may be missing or corrupt. Please check or rerun setup."
     IDS_EE_PROFILING_FAILURE                "Profiling failure"
 
 
@@ -1527,8 +1527,7 @@ BEGIN
 
     IDS_EE_WRONG_METADATA_VERSION           "'%1' has an incompatible metadata format. The assembly must be compiled using metadata format '%2'."
     IDS_CLASSLOAD_COLLECTIBLEFIXEDVTATTR   "Collectible type '%1' has unsupported FixedAddressValueTypeAttribute applied to a field."
-    IDS_EE_JIT_COMPILER_ERROR               "JIT Compiler encountered an internal limitation."
-    IDS_UNMARSHALABLE_DEMAND_OBJECT         "The security object (Permission or PermissionSet) used for performing a Demand caused an error relating to serialization/deserialization."
+    IDS_EE_JIT_COMPILER_ERROR               "The JIT compiler encountered invalid IL code or an internal limitation."
     IDS_EE_OBJECT_TO_VARIANT_NOT_SUPPORTED  "Invalid managed/unmanaged type combination (Marshaling to and from COM VARIANTs isn't supported)."
     IDS_EE_OBJECT_TO_ITF_NOT_SUPPORTED      "Invalid managed/unmanaged type combination (Marshaling to and from COM interface pointers isn't supported)."
 
diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h
index 49f1d0e..676d28f 100644
--- a/src/dlls/mscorrc/resource.h
+++ b/src/dlls/mscorrc/resource.h
@@ -748,7 +748,6 @@
 #define IDS_CLASSLOAD_GENERICTYPE_RECURSIVE     0x207D
 #define IDS_LOADINTROSPECTION_DISALLOWED        0x207E
 #define IDS_EE_JIT_COMPILER_ERROR               0x207F
-#define IDS_UNMARSHALABLE_DEMAND_OBJECT         0x2080
 #define BFA_TYPE_FWD_CHAIN_TOO_LONG             0x2081
 
 #define IDS_ER_APPLICATION                      0x2082