Fix 23740 (#23906)
authorSteve MacLean <stmaclea@microsoft.com>
Fri, 12 Apr 2019 00:28:25 +0000 (20:28 -0400)
committerGitHub <noreply@github.com>
Fri, 12 Apr 2019 00:28:25 +0000 (20:28 -0400)
Adjust AssemblyLoadContextBaseObject packing for
windows arm.

src/vm/object.h

index cc0810f..b9b7b3a 100644 (file)
@@ -1613,9 +1613,9 @@ NOINLINE AssemblyBaseObject* GetRuntimeAssemblyHelper(LPVOID __me, DomainAssembl
 // AssemblyLoadContextBaseObject
 // This class is the base class for AssemblyLoadContext
 //
-#if (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL)
+#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
 #include "pshpack4.h"
-#endif // (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL)
+#endif // defined(_TARGET_X86_) && !defined(FEATURE_PAL)
 class AssemblyLoadContextBaseObject : public Object
 {
     friend class MscorlibBinder;
@@ -1653,9 +1653,9 @@ class AssemblyLoadContextBaseObject : public Object
   public:
     INT_PTR GetNativeAssemblyLoadContext() { LIMITED_METHOD_CONTRACT; return _nativeAssemblyLoadContext; }
 };
-#if (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL)
+#if defined(_TARGET_X86_) && !defined(FEATURE_PAL)
 #include "poppack.h"
-#endif // (defined(_TARGET_X86_) || defined(_TARGET_ARM_)) && !defined(FEATURE_PAL)
+#endif // defined(_TARGET_X86_) && !defined(FEATURE_PAL)
 
 // AssemblyNameBaseObject 
 // This class is the base class for assembly names