diff --git a/include/v8config.h b/include/v8config.h
index 5ea6740f61..a967d92c39 100644
--- a/include/v8config.h
+++ b/include/v8config.h
@@ -351,7 +351,7 @@ path. Add it with -I<path> to the command line
 // for now.
 #if (defined(_M_X64) || defined(__x86_64__) || defined(__AARCH64EL__) || \
      defined(_M_ARM64)) /* x64 or arm64 */ \
-     && !defined(BUILDING_V8_SHARED) && !defined(USING_V8_SHARED)
+     && !defined(COMPONENT_BUILD)
 # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most))
 #endif
 # define V8_HAS_ATTRIBUTE_VISIBILITY (__has_attribute(visibility))
diff --git a/src/zone/zone.h b/src/zone/zone.h
index eac6cc0a47..3ddda6b2df 100644
--- a/src/zone/zone.h
+++ b/src/zone/zone.h
@@ -235,7 +235,7 @@ class V8_EXPORT_PRIVATE Zone final {
 
   // Expand the Zone to hold at least 'size' more bytes.
   // Should only be called if there is not enough room in the Zone already.
-  V8_NOINLINE void Expand(size_t size);
+  V8_NOINLINE V8_PRESERVE_MOST void Expand(size_t size);
 
   // The free region in the current (front) segment is represented as
   // the half-open interval [position, limit). The 'position' variable